diff --git a/apps/theming/css/theming.scss b/apps/theming/css/theming.scss
index e2cd8fb11e..ea3792458f 100644
--- a/apps/theming/css/theming.scss
+++ b/apps/theming/css/theming.scss
@@ -82,10 +82,9 @@ $invert: luma($color-primary) > 0.6;
 			@include icon-color('checkbox-mark', 'actions', $color-white, 1, true);
 		}
 	}
-	#body-user {
-		.primary {
-			border: 1px solid transparent;
-		}
+	/* Always give primary button a border for light primary colors */
+	.primary {
+		border-color: var(--color-border) !important;
 	}
 } @else {
 	#appmenu:not(.inverted) svg {
diff --git a/core/css/inputs.scss b/core/css/inputs.scss
index e96f055f24..8b4198644d 100644
--- a/core/css/inputs.scss
+++ b/core/css/inputs.scss
@@ -90,7 +90,7 @@ div[contenteditable=true],
 		cursor: pointer;
 
 		/* Apply border to primary button if on log in page (and not in a dark container) or if in header */
-		#body-login :not(body-login-container) &,
+		#body-login :not(.body-login-container) &,
 		#header & {
 			border-color: var(--color-primary-text);
 		}