diff --git a/rainloop/v/0.0.0/app/templates/Views/User/Login.html b/rainloop/v/0.0.0/app/templates/Views/User/Login.html
index 64ba702f6..ec2c08e32 100644
--- a/rainloop/v/0.0.0/app/templates/Views/User/Login.html
+++ b/rainloop/v/0.0.0/app/templates/Views/User/Login.html
@@ -66,19 +66,26 @@
 				</div>
 				<div class="controls">
 					<div class="pull-right social-buttons">
-						<a href="#" tabindex="-1" class="social-button" data-bind="command: facebookCommand, visible: facebookLoginEnabled, tooltip: 'LOGIN/TITLE_SIGN_IN_FACEBOOK'">
-							<i class="icon-facebook-alt"></i>
-						</a>
-						<a href="#" tabindex="-1" class="social-button" data-bind="command: googleCommand, visible: googleLoginEnabled, tooltip: 'LOGIN/TITLE_SIGN_IN_GOOGLE'">
-							<i class="icon-google"></i>
-						</a>
-						<a href="#" tabindex="-1" class="social-button" data-bind="command: twitterCommand, visible: twitterLoginEnabled, tooltip: 'LOGIN/TITLE_SIGN_IN_TWITTER'">
-							<i class="icon-twitter"></i>
-						</a>
-						<a href="#" tabindex="-1" class="language-button" data-bind="click: selectLanguage, tooltip: 'POPUPS_LANGUAGES/TITLE_LANGUAGES',
-								visible: allowLanguagesOnLogin() && !socialLoginEnabled()">
-							<i data-bind="css: langRequest() ? 'icon-spinner animated' : 'icon-world'"></i>
-						</a>
+						<span data-bind="visible: facebookLoginEnabled">
+							<a href="#" tabindex="-1" class="social-button" data-bind="command: facebookCommand, tooltip: 'LOGIN/TITLE_SIGN_IN_FACEBOOK'">
+								<i class="icon-facebook-alt"></i>
+							</a>
+						</span>
+						<span data-bind="visible: googleLoginEnabled">
+							<a href="#" tabindex="-1" class="social-button" data-bind="command: googleCommand, tooltip: 'LOGIN/TITLE_SIGN_IN_GOOGLE'">
+								<i class="icon-google"></i>
+							</a>
+						</span>
+						<span data-bind="visible: twitterLoginEnabled">
+							<a href="#" tabindex="-1" class="social-button" data-bind="command: twitterCommand, tooltip: 'LOGIN/TITLE_SIGN_IN_TWITTER'">
+								<i class="icon-twitter"></i>
+							</a>
+						</span>
+						<span data-bind="visible: allowLanguagesOnLogin() && !socialLoginEnabled()">
+							<a href="#" tabindex="-1" class="language-button" data-bind="click: selectLanguage, tooltip: 'POPUPS_LANGUAGES/TITLE_LANGUAGES'">
+								<i data-bind="css: langRequest() ? 'icon-spinner animated' : 'icon-world'"></i>
+							</a>
+						</span>
 					</div>
 					<label class="signMeLabel inline" data-bind="click: function () { signMe(!signMe()); }, visible: signMeVisibility">
 						<i data-bind="css: signMe() ? 'checkboxSignMe icon-checkbox-checked' : 'checkboxSignMe icon-checkbox-unchecked'"></i>