diff --git a/client/css/style.css b/client/css/style.css
index 1a06b605..0544b28d 100644
--- a/client/css/style.css
+++ b/client/css/style.css
@@ -1637,7 +1637,8 @@ part/quit messages where we don't load previews (adds a blank line otherwise) */
 	flex-grow: 0;
 }
 
-#loading .logo-inverted {
+#loading .logo-inverted,
+#windows .logo-inverted {
 	display: none; /* In dark themes, inverted logo must be used instead */
 }
 
diff --git a/client/js/socket-events/auth.js b/client/js/socket-events/auth.js
index cd5fa48e..8f527a82 100644
--- a/client/js/socket-events/auth.js
+++ b/client/js/socket-events/auth.js
@@ -21,7 +21,6 @@ socket.on("auth", function(data) {
 	if (data.serverHash > -1) {
 		utils.serverHash = data.serverHash;
 
-		$("#loading").remove();
 		login.html(templates.windows.sign_in());
 
 		utils.togglePasswordField("#sign-in .reveal-password");
@@ -81,6 +80,7 @@ socket.on("auth", function(data) {
 		return;
 	}
 
+	$("#loading").remove();
 	$("#footer")
 		.find(".sign-in")
 		.trigger("click", {