diff --git a/app/controllers/account_controller.rb b/app/controllers/account_controller.rb
index 9842b9ea..79d3041e 100644
--- a/app/controllers/account_controller.rb
+++ b/app/controllers/account_controller.rb
@@ -248,6 +248,7 @@ class AccountController < ApplicationController
   def register_automatically(user, &block)
     # Automatic activation
     user.status = User::STATUS_ACTIVE
+    user.last_login_on = Time.now
     if user.save
       self.logged_user = user
       flash[:notice] = l(:notice_account_activated)
diff --git a/test/integration/account_test.rb b/test/integration/account_test.rb
index a8274333..e8ae884a 100644
--- a/test/integration/account_test.rb
+++ b/test/integration/account_test.rb
@@ -110,7 +110,10 @@ class AccountTest < ActionController::IntegrationTest
     assert_response :success
     assert_template 'my/account'
     
-    assert User.find_by_login('newuser').active?
+    user = User.find_by_login('newuser')
+    assert_not_nil user
+    assert user.active?
+    assert_not_nil user.last_login_on
   end
   
   def test_register_with_manual_activation