diff --git a/src/sunstone/etc/sunstone-server.conf b/src/sunstone/etc/sunstone-server.conf
index 5d993ee8a0..b3c7b1fd4f 100644
--- a/src/sunstone/etc/sunstone-server.conf
+++ b/src/sunstone/etc/sunstone-server.conf
@@ -125,6 +125,9 @@
 # Login Session Length in seconds, defaults to 1 hour.
 #:session_expire_time: 3600
 
+# True to display 'Keep me logged in' option.
+:keep_me_logged: true
+
 # Default language setting
 :lang: en_US
 
diff --git a/src/sunstone/views/_login_standard.erb b/src/sunstone/views/_login_standard.erb
index e870cfe84b..26fcaf71dc 100644
--- a/src/sunstone/views/_login_standard.erb
+++ b/src/sunstone/views/_login_standard.erb
@@ -4,24 +4,24 @@
     background-size: 355px;">
       </div>
 
-
-
-      <form id="login_form" method="post">
-        <div class="border" id="login">
-            <div class="content">
-                Username
-                <input type="text" size="15" name="username" id="username" class="box"/>
-                Password
-                <input type="password" size="15" name="password" id="password" class="box"/>
-                <br />
-                <input type="checkbox" id="check_remember" />
-                <label id="label_remember" for="check_remember">Keep me logged in</label>
-                <input type="submit" id="login_btn" value="" />
-                <img src="images/ajax-loader.gif" alt="retrieving" id="login_spinner" />
-            </div>
-        <div id="error_box" class="hidden alert-box alert" style="display: none">
-          <span id="error_message"></span>
-        </div>
-        </div>
-      </form>
+  <form id="login_form" method="post">
+    <div class="border" id="login">
+      <div class="content">
+          Username
+          <input type="text" size="15" name="username" id="username" class="box"/>
+          Password
+          <input type="password" size="15" name="password" id="password" class="box"/>
+          <br />
+          <% if $conf[:keep_me_logged] %>
+            <input type="checkbox" id="check_remember" />
+            <label id="label_remember" for="check_remember">Keep me logged in</label>
+          <% end %>
+          <input type="submit" id="login_btn" value="" />
+          <img src="images/ajax-loader.gif" alt="retrieving" id="login_spinner" />
+      </div>
+      <div id="error_box" class="hidden alert-box alert" style="display: none">
+        <span id="error_message"></span>
+      </div>
+    </div>
+  </form>
 </div>
diff --git a/src/sunstone/views/_login_x509.erb b/src/sunstone/views/_login_x509.erb
index 3176dfda60..a18b0dc98a 100644
--- a/src/sunstone/views/_login_x509.erb
+++ b/src/sunstone/views/_login_x509.erb
@@ -4,18 +4,19 @@
     background-size: 355px;">
       </div>
 
-      <form id="login_form" method="post">
-        <div class="border" id="login" style='height:169px;background:url("../images/panel_short.png") no-repeat scroll center transparent'>
-            <div class="content">
-                <input style="float:left;" type="submit" id="login_btn" value="" />
-                <input type="checkbox" id="check_remember" />
-                <label id="label_remember" for="check_remember">Keep me logged in</label>
-
-            </div>
-        <div id="error_box" class="hidden alert-box alert" style="display: none">
-          <span id="auth_error"></span>
-          <span id="one_error"></span>
-        </div>
-        </div>
-      </form>
+  <form id="login_form" method="post">
+    <div class="border" id="login" style='height:169px;background:url("../images/panel_short.png") no-repeat scroll center transparent'>
+      <div class="content">
+        <input style="float:left;" type="submit" id="login_btn" value="" />
+        <% if $conf[:keep_me_logged] %>
+          <input type="checkbox" id="check_remember" />
+          <label id="label_remember" for="check_remember">Keep me logged in</label>
+        <% end %>
+      </div>
+      <div id="error_box" class="hidden alert-box alert" style="display: none">
+        <span id="auth_error"></span>
+        <span id="one_error"></span>
+      </div>
+    </div>
+  </form>
 </div>