diff --git a/skinStyles/mediawiki.special.userlogin.common.styles/minerva.less b/skinStyles/mediawiki.special.userlogin.common.styles/minerva.less
index 4a173a4..7d8f08a 100644
--- a/skinStyles/mediawiki.special.userlogin.common.styles/minerva.less
+++ b/skinStyles/mediawiki.special.userlogin.common.styles/minerva.less
@@ -136,6 +136,33 @@
 	}
 }
 
+// Hide keep me logged in checkbox on mobile. It will be marked as checked by default.
+#userloginForm {
+	.mw-htmlform-field-HTMLCheckField {
+		display: none;
+	}
+}
+
+.client-nojs {
+	// Show keep me logged in checkbox for grade C users on mobile so that they can
+	// check the checkbox (we use JS to check this and that won't run on grade C bmode)
+	#userloginForm {
+		.mw-htmlform-field-HTMLCheckField {
+			display: block;
+			margin: 10px 0 11px;
+		}
+	}
+}
+
+@media all and ( min-width: @width-breakpoint-tablet ) {
+	// If tablet mode, show the keep me logged in checkbox
+	#userloginForm {
+		.mw-htmlform-field-HTMLCheckField {
+			display: block;
+		}
+	}
+}
+
 // FIXME: Some of these rules should actually be mobile first, only hiding inputs needs to be wrapped in a media query
 @media all and ( max-width: @width-breakpoint-tablet ) {
 	@margin: 12px;
@@ -148,9 +175,7 @@
 		// benefits are obvious through the workflows
 		#wpReason,
 		// real name in account creation is not so important on mobile
-		#wpRealName,
-		// Hide keep me logged in checkbox on mobile.
-		.mw-ui-checkbox {
+		#wpRealName {
 			display: none !important;
 		}
 	}