diff --git a/modules/core/templates/loginuserpass.php b/modules/core/templates/loginuserpass.php
index 8a742292c30a88ba034ea8e53c6df8a2b8a59e6f..b60e9bbe833b42b13f7635b7e9d1f0f3720afa1d 100644
--- a/modules/core/templates/loginuserpass.php
+++ b/modules/core/templates/loginuserpass.php
@@ -42,8 +42,8 @@ if ($this->data['errorcode'] !== null) {
     <form action="?" method="post" name="f">
         <table>
             <tr>
-                <td rowspan="2">
-                    <img id="loginicon" alt=""
+                <td rowspan="2" id="loginicon">
+                    <img alt=""
                         src="/<?php echo $this->data['baseurlpath']; ?>resources/icons/experience/gtk-dialog-authentication.48x48.png" />
                 </td>
                 <td><label for="username"><?php echo $this->t('{login:username}'); ?></label></td>
@@ -58,7 +58,7 @@ if ($this->data['errorcode'] !== null) {
             if ($this->data['rememberUsernameEnabled'] && !$this->data['forceUsername']) {
                 // display the "remember my username" checkbox
             ?>
-                <td>
+                <td id="regular_remember_username">
                     <input type="checkbox" id="remember_username" tabindex="4"
                            <?php echo ($this->data['rememberUsernameChecked']) ? 'checked="checked"' : ''; ?>
                            name="remember_username" value="Yes"/>
@@ -68,6 +68,22 @@ if ($this->data['errorcode'] !== null) {
             }
             ?>
             </tr>
+            <?php
+            if ($this->data['rememberUsernameEnabled'] && !$this->data['forceUsername']) {
+                // display the "remember my username" checkbox
+                ?>
+            <tr id="mobile_remember_username">
+                <td>&nbsp;</td>
+                <td>
+                    <input type="checkbox" id="remember_username" tabindex="4"
+                        <?php echo ($this->data['rememberUsernameChecked']) ? 'checked="checked"' : ''; ?>
+                           name="remember_username" value="Yes"/>
+                    <small><?php echo $this->t('{login:remember_username}'); ?></small>
+                </td>
+            </tr>
+                <?php
+            }
+            ?>
             <tr>
                 <td><label for="password"><?php echo $this->t('{login:password}'); ?></label></td>
                 <td>
@@ -77,7 +93,7 @@ if ($this->data['errorcode'] !== null) {
             if ($this->data['rememberMeEnabled']) {
                 // display the remember me checkbox (keep me logged in)
             ?>
-                <td>
+                <td id="regular_remember_me">
                     <input type="checkbox" id="remember_me" tabindex="5"
                         <?php echo ($this->data['rememberMeChecked']) ? 'checked="checked"' : ''; ?>
                            name="remember_me" value="Yes"/>
@@ -88,6 +104,22 @@ if ($this->data['errorcode'] !== null) {
             ?>
             </tr>
             <?php
+            if ($this->data['rememberMeEnabled']) {
+                // display the remember me checkbox (keep me logged in)
+            ?>
+            <tr>
+                <td></td>
+                <td id="mobile_remember_me">
+                    <input type="checkbox" id="remember_me" tabindex="5"
+                        <?php echo ($this->data['rememberMeChecked']) ? 'checked="checked"' : ''; ?>
+                           name="remember_me" value="Yes"/>
+                    <small><?php echo $this->t('{login:remember_me}'); ?></small>
+                </td>
+            </tr>
+            <?php
+            }
+            ?>
+            <?php
             if (array_key_exists('organizations', $this->data)) {
                 ?>
                 <tr>
@@ -120,16 +152,24 @@ if ($this->data['errorcode'] !== null) {
                 <?php
             }
             ?>
-            <tr>
+            <tr id="regularsubmit">
                 <td></td><td></td>
                 <td>
-                    <button id="regularsubmit" class="btn"
+                    <button class="btn"
                             onclick="this.value='<?php echo $this->t('{login:processing}'); ?>';
                                 this.disabled=true; this.form.submit(); return true;" tabindex="6">
                         <?php echo $this->t('{login:login_button}'); ?>
                     </button>
                 </td>
             </tr>
+            <tr id="mobilesubmit">
+                <td></td>
+                <td>
+                    <button class="btn" tabindex="6">
+                        <?php echo $this->t('{login:login_button}'); ?>
+                    </button>
+                </td>
+            </tr>
         </table>
         <?php
         foreach ($this->data['stateparams'] as $name => $value) {
diff --git a/www/resources/default.css b/www/resources/default.css
index 376699751ee1a4024e687c0f46a6da220f7f8048..ab6cfe3ef2b170932df63a6d01eb2ae02a3da92c 100644
--- a/www/resources/default.css
+++ b/www/resources/default.css
@@ -368,12 +368,14 @@ caption {
 .float-l {
 	float: left;
 }
-#mobilesubmit {
+
+#mobilesubmit, #mobile_remember_username, #mobile_remember_me {
 	display: none;
 }
 
 @media handheld, only screen and (max-width: 480px), only screen and (max-device-width: 480px) {
-	#header, #languagebar, #footer, .erroricon, #loginicon, .logintext, #regularsubmit {
+	#header, #languagebar, #footer, .erroricon, #loginicon, .logintext, #regularsubmit,
+	#regular_remember_username, #regular_remember_me {
 		display: none;
 	}
 	body {
@@ -395,12 +397,12 @@ caption {
 		height: 1.5em;
 		font-size: 1em;
 	}
-	#mobilesubmit {
-		display: inline;
-	}
 	.youareadmin {
 		font-size: 50%;
 	}
+	#mobilesubmit, #mobile_remember_username, #mobile_remember_me {
+		display: table-row;
+	}
 }
 
 .btn, .btnaddonright {