diff --git a/builtin/mainmenu/tab_local.lua b/builtin/mainmenu/tab_local.lua
index 9d60e7c41..910245bf0 100644
--- a/builtin/mainmenu/tab_local.lua
+++ b/builtin/mainmenu/tab_local.lua
@@ -157,24 +157,21 @@ local function get_formspec(_, _, tab_data)
 			"image_button[9.3,4.84;2.7,0.92;;world_configure;" .. fgettext("Select Mods") .. ";true;false]"
 	end
 
-	local enable_server = core.settings:get_bool("enable_server")
-	if enable_server then
 		retval = retval ..
-			"checkbox[6.6,5;cb_server;".. fgettext("Create Server") ..";" ..
-				dump(enable_server) .. "]"
-	end
-
-	if enable_server then
-		if core.settings:get_bool("server_announce") then
-			retval = retval ..
-				"checkbox[9.3,5;cb_server_announce;" .. fgettext("Announce Server") .. ";true]"
-		end
+				"checkbox[6.6,5;cb_server;".. fgettext("Create Server") ..";" ..
+					dump(core.settings:get_bool("enable_server")) .. "]"
 
+	if core.settings:get_bool("enable_server") then
 		retval = retval ..
-			-- Name / Password
-			"field[6.9,4.6;2.8,0.5;te_playername;" .. fgettext("Name") .. ":;" ..
-				esc(core.settings:get("name")) .. "]" ..
-			"pwdfield[9.6,4.6;2.8,0.5;te_passwd;" .. fgettext("Password") .. ":]"
+				"checkbox[6.6,0.65;cb_server_announce;" .. fgettext("Announce Server") .. ";" ..
+					dump(core.settings:get_bool("server_announce")) .. "]" ..
+
+				-- Name / Password
+				"label[6.6,-0.3;" .. fgettext("Name") .. ":" .. "]" ..
+				"label[9.3,-0.3;" .. fgettext("Password") .. ":" .. "]" ..
+				"field[6.9,0.6;2.8,0.5;te_playername;;" ..
+					esc(core.settings:get("name")) .. "]" ..
+				"pwdfield[9.6,0.6;2.8,0.5;te_passwd;]"
 	end
 
 	return retval