diff --git a/src/login/LoginView.cpp b/src/login/LoginView.cpp
index 72d4595d7..5a31f4521 100644
--- a/src/login/LoginView.cpp
+++ b/src/login/LoginView.cpp
@@ -35,12 +35,13 @@ LoginView::LoginView():
 	loginButton(new ui::Button(ui::Point(200-100, 87-17), ui::Point(100, 17), "Sign in")),
 	cancelButton(new ui::Button(ui::Point(0, 87-17), ui::Point(101, 17), "Cancel")),
 	titleLabel(new ui::Label(ui::Point(4, 5), ui::Point(200-16, 16), "Server login")),
-	usernameField(new ui::Textbox(ui::Point(8, 25), ui::Point(200-16, 17), Client::Ref().GetAuthUser().Username)),
-	passwordField(new ui::Textbox(ui::Point(8, 46), ui::Point(200-16, 17), "")),
+	usernameField(new ui::Textbox(ui::Point(8, 25), ui::Point(200-16, 17), Client::Ref().GetAuthUser().Username, "[username]")),
+	passwordField(new ui::Textbox(ui::Point(8, 46), ui::Point(200-16, 17), "", "[password]")),
 	infoLabel(new ui::Label(ui::Point(8, 67), ui::Point(200-16, 16), "")),
 	targetSize(0, 0)
 {
 	targetSize = Size;
+	FocusComponent(usernameField);
 	
 	infoLabel->Appearance.HorizontalAlign = ui::Appearance::AlignCentre;	infoLabel->Appearance.VerticalAlign = ui::Appearance::AlignMiddle;
 	infoLabel->Visible = false;