diff --git a/api/app/assets/javascripts/mno_enterprise/config.js.coffee.erb b/api/app/assets/javascripts/mno_enterprise/config.js.coffee.erb
index 8904abf77..40225fefa 100644
--- a/api/app/assets/javascripts/mno_enterprise/config.js.coffee.erb
+++ b/api/app/assets/javascripts/mno_enterprise/config.js.coffee.erb
@@ -25,5 +25,5 @@ angular.module('mnoEnterprise.configuration', [])
   .constant('APP_NAME', <%= MnoEnterprise.app_name.to_json %>)
   .constant('URL_CONFIG', <%= Hash(Settings.url_config).to_json %>)
   .constant('DEVISE_CONFIG', <%=
-      Hash(Settings.devise).merge(min_password_length: Devise.password_length.min).to_json
+      Hash(Settings.devise).merge(min_password_length: Devise.password_length.min, timeout_in: Devise.timeout_in).to_json
     %>)
diff --git a/api/app/views/mno_enterprise/auth/sessions/new.html.haml b/api/app/views/mno_enterprise/auth/sessions/new.html.haml
index 6a1844864..0319ff47b 100644
--- a/api/app/views/mno_enterprise/auth/sessions/new.html.haml
+++ b/api/app/views/mno_enterprise/auth/sessions/new.html.haml
@@ -1,6 +1,9 @@
 .registration
   .container
     .row
+      - if params[:session_timeout].present?
+        .alert.alert-warning.text-center
+          = t('mno_enterprise.auth.sessions.new.timeout')
       .login-box-wrapper
         .login-box-title
           %h2= t('mno_enterprise.auth.sessions.new.title')
diff --git a/core/config/locales/views/auth/sessions/en.yml b/core/config/locales/views/auth/sessions/en.yml
index 54677c684..50046531b 100644
--- a/core/config/locales/views/auth/sessions/en.yml
+++ b/core/config/locales/views/auth/sessions/en.yml
@@ -5,3 +5,11 @@ en:
         new:
           title: Sign In
           sign_in: Sign in
+          timeout: You are logged off due to inactivity. Please log in again
+        timeout:
+          header: "Session Timeout"
+          body:
+            can_login: "Your session has expired due to inactivity. You can extend your session or log out by clicking on the relevant option below"
+          stay_logged_in: "Stay Logged In"
+          log_off: "Log Off"
+          error: "We could not manage to remain you logged in. You will be redirected to the login page"