assigned a user id, does not "appear" to have screwed anything up

app/controllers/admin_controller.rb

@@ -31,7 +31,7 @@ class AdminController < ApplicationController
   
   def delete_user
     user = User.find_by_id(params[:admin_id])
-    if user && !(current_user.id == user.id)
+    if user && !(current_user.user_id == user.user_id)
       user.delete
       message = true
     end

app/controllers/application_controller.rb

@@ -9,7 +9,7 @@ class ApplicationController < ActionController::Base
   private
 
   def current_user
-    @current_user ||= User.find_by_id(session[:id].to_s)
+    @current_user ||= User.find_by_user_id(session[:user_id].to_s)
   end
   
   def authenticated

app/controllers/sessions_controller.rb

@@ -15,7 +15,7 @@ class SessionsController < ApplicationController
       end
       
       if user
-        session[:id] = user.id if User.where(:id => user.id).exists?
+        session[:user_id] = user.user_id if User.where(:user_id => user.user_id).exists?
         redirect_to home_dashboard_index_path
       else
         # Removed this code, just doesn't seem specific enough!

app/controllers/users_controller.rb

@@ -9,7 +9,7 @@ class UsersController < ApplicationController
   def create
     user = User.new(params[:user])
     if user.save
-      session[:id] = user.id
+      session[:user_id] = user.user_id
       redirect_to home_dashboard_index_path
     else
       @user = user
@@ -22,11 +22,12 @@ class UsersController < ApplicationController
   end
   
   def update
+    current_user.skip_user_id_assign = true
     current_user.update_attributes(params[:user].reject { |k| k == ("password" || "password_confirmation") })
     pass = params[:user][:password]
     current_user.password = pass if !(pass.blank?)
     current_user.save!
-    redirect_to user_account_settings_path(:user_id => current_user.id) 
+    redirect_to user_account_settings_path(:user_id => current_user.user_id) 
   end
   
 end