diff --git a/app/controllers/account_controller.rb b/app/controllers/account_controller.rb
index 981e0cb3c..3089386bf 100644
--- a/app/controllers/account_controller.rb
+++ b/app/controllers/account_controller.rb
@@ -44,6 +44,10 @@ class AccountController < ApplicationController
     # display the logout form
   end
 
+  def heartbeat
+    render :json => session[:user_id]
+  end
+
   # Lets user choose a new password
   def lost_password
     (redirect_to(home_url); return) unless Setting.lost_password?
diff --git a/config/routes.rb b/config/routes.rb
index d3b8a1b37..ae87c6a65 100644
--- a/config/routes.rb
+++ b/config/routes.rb
@@ -227,6 +227,8 @@ RedmineApp::Application.routes.draw do
   match '/projects/search',  :via => [:get, :post]
   match '/users/search', :via => [:get, :post]
   #end
+
+  match 'account/heartbeat', to: 'account#heartbeat', :via => :get
   match 'login', :to => 'account#login', :as => 'signin', :via => [:get, :post]
   match 'logout', :to => 'account#logout', :as => 'signout', :via => [:get, :post]
   match 'account/register', :via => [:get, :post], :as => 'register'
diff --git a/public/javascripts/application.js b/public/javascripts/application.js
index f61738935..b2bd70d8d 100644
--- a/public/javascripts/application.js
+++ b/public/javascripts/application.js
@@ -571,10 +571,16 @@ function warnLeavingUnsaved(message) {
   };
 }
 
-function setupAjaxIndicator() {
+function setupHeartBeat(){
+  var time = 60*1000*30; // 30 mins
+  setInterval(function(){$.getJSON('/account/heartbeat');},time);
+}
 
+function setupAjaxIndicator() {
   $('#ajax-indicator').bind('ajaxSend', function(event, xhr, settings) {
-
+    if(settings && settings.url && settings.url.endsWith('account/heartbeat')){
+      return;
+    }
     if ($('.ajax-loading').length === 0 && settings.contentType != 'application/octet-stream') {
       $('#ajax-indicator').show();
     }
@@ -622,6 +628,7 @@ function transpotUrl (scope) {
 }
 
 $(document).ready(setupAjaxIndicator);
+$(document).ready(setupHeartBeat);
 $(document).ready(hideOnLoad);
 $(document).ready(addFormObserversForDoubleSubmit);