diff --git a/app/controllers/sessions_controller.rb b/app/controllers/sessions_controller.rb
index 923b939..777bf6e 100755
--- a/app/controllers/sessions_controller.rb
+++ b/app/controllers/sessions_controller.rb
@@ -19,7 +19,11 @@ class SessionsController < ApplicationController
       end
       
       if user
-        cookies.permanent[:auth_token = user.auth_token ] if User.where(:user_id => user.user_id).exists?
+        if params[:remember_me]
+        cookies.permanent[:auth_token] = user.auth_token if User.where(:user_id => user.user_id).exists?
+        else
+        cookies[:auth_token] = user.auth_token if User.where(:user_id => user.user_id).exists?
+        end
         redirect_to path
       else
         # Removed this code, just doesn't seem specific enough!