diff --git a/app/controllers/account_controller.rb b/app/controllers/account_controller.rb
index f8d0f5dd1..22db3d5b4 100644
--- a/app/controllers/account_controller.rb
+++ b/app/controllers/account_controller.rb
@@ -332,7 +332,7 @@ class AccountController < ApplicationController
     token = Token.create(:user => user, :action => 'autologin')
     cookie_options = {
       :value => token.value,
-      :expires => 1.year.from_now,
+      :expires => 7.days.from_now,
       :path => (Redmine::Configuration['autologin_cookie_path'] || '/'),
       :secure => (Redmine::Configuration['autologin_cookie_secure'] ? true : false),
       :httponly => true
diff --git a/app/views/account/login.html.erb b/app/views/account/login.html.erb
index 4175282b3..bb289eb03 100644
--- a/app/views/account/login.html.erb
+++ b/app/views/account/login.html.erb
@@ -68,7 +68,7 @@
     <td align="left">
         <% if Setting.autologin? %>
         <label for="autologin">
-          <%= check_box_tag 'autologin', 1, false, :tabindex => 4 %>
+          <%= check_box_tag 'autologin', 1, true, :tabindex => 4 %>
           <%= l(:label_stay_logged_in) %>
         </label>
         <% end %>