## start of form
		  <%= error_messages_for 'user' %>
		  <% form_for :user do |form| %>

## Change password method
  def password
    @user = User.find(session[:user_id])
        return unless request.post?
        if User.authenticate(current_user.login, params[:old_password])
          if ((params[:password] == params[:password_confirmation]) &&
                                !params[:password_confirmation].blank?)
            current_user.password_confirmation = params[:password_confirmation]
            current_user.password = params[:password]

            if current_user.save
              flash.now[:notice] = "Password successfully updated"
              render :action => 'password'
            else
              flash.now[:error] = "Password not changed"
            end

          else
            flash.now[:error] = "New Password mismatch"
            @old_password = params[:old_password]
            render :action => 'password'
          end
        else
          flash.now[:error] = "Old password incorrect"
          render :action => 'password'
        end
      end