diff --git a/data/gui/online/guest_login.stkgui b/data/gui/online/guest_login.stkgui
index 013469aa2..afaf35273 100644
--- a/data/gui/online/guest_login.stkgui
+++ b/data/gui/online/guest_login.stkgui
@@ -15,19 +15,19 @@
 
         <box proportion="1" width="100%" layout="vertical-row">
             <header id="title" width="96%" height="fit" text_align="center" word_wrap="true"
-                    I18N="In the login dialog" text="Guest Sign in"/>
+                    I18N="In the login dialog" text="Guest Log in"/>
             <spacer height="15" width="10"/>
             <box proportion="4" width="90%" layout="vertical-row" align="center">
                 <div x="2%" y="2%" width="96%" height="80%" layout="vertical-row" id="outer_box" >
                     <label I18N="In the login dialog" proportion="4" word_wrap="true"
-                        text="Signing in as a guest allows you to participate in online races, but it does not allow you to vote for addons, or collect any achievements while being online."
+                        text="Logging in as a guest allows you to participate in online races, but it does not allow you to vote for addons, or collect any achievements while being online."
                          align="center"/>
                 </div>
             </box>
             <spacer height="15" width="10"/>
             <buttonbar id="options" width="90%" height="13%" align="bottom">
                 <icon-button id="sign_in" width="64" height="64" icon="gui/green_check.png"
-                             I18N="In the login dialog"  text="Sign In" label_location="bottom"/>
+                             I18N="In the login dialog"  text="Log In" label_location="bottom"/>
                 <icon-button id="cancel" width="64" height="64" icon="gui/main_quit.png"
                              I18N="In the login dialog" text="Close" label_location="bottom"/>
             </buttonbar>
diff --git a/data/gui/online/main.stkgui b/data/gui/online/main.stkgui
index b4cf4df8e..37d7d2f36 100644
--- a/data/gui/online/main.stkgui
+++ b/data/gui/online/main.stkgui
@@ -35,7 +35,7 @@
                 <icon-button id="profile" width="64" height="64" icon="gui/green_check.png"  extend_label="50"
                              I18N="In the online multiplayer screen" text="Profile" label_location="hover"/>
                 <icon-button id="sign_out" width="64" height="64" icon="gui/main_quit.png"  extend_label="70"
-                             I18N="In the online multiplayer screen" text="Sign Out" label_location="hover"/>
+                             I18N="In the online multiplayer screen" text="Log Out" label_location="hover"/>
             </buttonbar>
 
         </bottombar>
diff --git a/src/main.cpp b/src/main.cpp
index 381486f2f..2c3bba315 100644
--- a/src/main.cpp
+++ b/src/main.cpp
@@ -479,8 +479,8 @@ void cmdLineHelp()
     // "                            n=1: recorded positions\n"
     // "                            n=2: recorded key strokes\n"
     "       --server           Start a server (not a playing client).\n"
-    "       --login=s          Automatically sign in (set the login).\n"
-    "       --password=s       Automatically sign in (set the password).\n"
+    "       --login=s          Automatically log in (set the login).\n"
+    "       --password=s       Automatically log in (set the password).\n"
     "       --port=n           Port number to use.\n"
     "       --max-players=n    Maximum number of clients (server only).\n"
     "       --no-console       Does not write messages in the console but to\n"
diff --git a/src/online/online_player_profile.cpp b/src/online/online_player_profile.cpp
index 19e3995f7..48f6f8523 100644
--- a/src/online/online_player_profile.cpp
+++ b/src/online/online_player_profile.cpp
@@ -246,7 +246,7 @@ namespace Online
                 m_player = player;
                 m_player->setUserDetails(this,
                     m_player->rememberPassword() ? "client-quit"
-                                       : "disconnect");
+                                                 : "disconnect");
                 setAbortable(false);
             }   // SignOutRequest
         };   // SignOutRequest
@@ -274,7 +274,7 @@ namespace Online
         if (!success)
         {
             Log::warn("OnlinePlayerProfile::signOut",
-                      "There were some connection issues while signing out. "
+                      "There were some connection issues while logging out. "
                       "Report a bug if this caused issues.");
             Log::warn("OnlinePlayerProfile::signOut", core::stringc(info.c_str()).c_str());
             if (user_screen)
diff --git a/src/states_screens/online_screen.cpp b/src/states_screens/online_screen.cpp
index c7bf9275f..cea7b4fe2 100644
--- a/src/states_screens/online_screen.cpp
+++ b/src/states_screens/online_screen.cpp
@@ -136,7 +136,7 @@ void OnlineScreen::init()
     Screen::init();
     setInitialFocus();
     DemoWorld::resetIdleTime();
-    core::stringw m = _("Signed in as: %s.",
+    core::stringw m = _("Logged in as: %s.",
                         PlayerManager::getCurrentOnlineUserName());
     m_online_status_widget->setText(m, false);
 }   // init
@@ -152,12 +152,12 @@ void OnlineScreen::onUpdate(float delta)
 
     if (m_recorded_state == PlayerProfile::OS_SIGNING_IN)
     {
-        m_online_status_widget->setText(StringUtils::loadingDots(_("Signing in")),
+        m_online_status_widget->setText(StringUtils::loadingDots(_("Logging in")),
                                         false                                   );
     }
     else if (m_recorded_state == PlayerProfile::OS_SIGNING_OUT)
     {
-        m_online_status_widget->setText(StringUtils::loadingDots(_("Signing out")),
+        m_online_status_widget->setText(StringUtils::loadingDots(_("Logging out")),
                                         false                                    );
     }
 }   // onUpdate
diff --git a/src/states_screens/user_screen.cpp b/src/states_screens/user_screen.cpp
index 8df444ba4..f30282642 100644
--- a/src/states_screens/user_screen.cpp
+++ b/src/states_screens/user_screen.cpp
@@ -441,8 +441,8 @@ void BaseUserScreen::onUpdate(float dt)
     if (!m_options_widget->isActivated())
     {
         core::stringw message = (m_state & STATE_LOGOUT)
-                              ? _(L"Signing out '%s'",m_sign_out_name.c_str())
-                              : _(L"Signing in '%s'", m_sign_in_name.c_str());
+                              ? _(L"Logging out '%s'",m_sign_out_name.c_str())
+                              : _(L"Logging in '%s'", m_sign_in_name.c_str());
         m_info_widget->setText(StringUtils::loadingDots(message.c_str()),
                                false                                      );
     }