diff --git a/dev/Styles/Ui.less b/dev/Styles/Ui.less
index 741d0242e..d5da8ad6b 100644
--- a/dev/Styles/Ui.less
+++ b/dev/Styles/Ui.less
@@ -180,6 +180,16 @@ e-spinner {
 	}
 }
 
+.e-languages {
+	margin-top: 8px;
+	color: #333;
+	.flag-name {
+		color: #333;
+		/*text-decoration: underline;*/
+		border-bottom: 1px dashed #333;
+	}
+}
+
 html.cssanimations {
 
 	.e-spinner {
diff --git a/rainloop/v/0.0.0/app/templates/Themes/template.less b/rainloop/v/0.0.0/app/templates/Themes/template.less
index 722dae325..44366e1ee 100644
--- a/rainloop/v/0.0.0/app/templates/Themes/template.less
+++ b/rainloop/v/0.0.0/app/templates/Themes/template.less
@@ -81,6 +81,14 @@
 	}
 }
 
+.thm-languages {
+	color: @languages-color;
+	.flag-name {
+		color: @languages-color;
+		border-bottom: 1px dashed @languages-color;
+	}
+}
+
 .g-ui-menu {
 	color: @dropdown-menu-color !important;
 	background-color: @dropdown-menu-background-color !important;
diff --git a/rainloop/v/0.0.0/app/templates/Themes/values.less b/rainloop/v/0.0.0/app/templates/Themes/values.less
index 97fec2864..27b38d769 100644
--- a/rainloop/v/0.0.0/app/templates/Themes/values.less
+++ b/rainloop/v/0.0.0/app/templates/Themes/values.less
@@ -19,6 +19,7 @@
 @login-gradient-start: none;	// #f4f4f4
 @login-gradient-end: none;		// #dfdfdf
 @powered-color: #333;
+@languages-color: #333;
 
 // MENU
 @dropdown-menu-color: #333;
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 90bf1a6c1..d4887632f 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
@@ -116,6 +116,14 @@
 			<div class="e-powered thm-powered" data-bind="visible: logoPowered">
 				Powered by <a href="http://rainloop.net" target="_blank">RainLoop</a>
 			</div>
+			<div class="e-languages thm-languages" data-bind="visible: allowLanguagesOnLogin">
+				<label class="flag-selector">
+					<span class="flag-wrapper">
+						<span data-bind="css: 'flag flag-' + mainLanguage()" style=""></span>
+					</span>
+					<span class="flag-name" data-bind="text: mainLanguageFullName, click: selectLanguage"></span>
+				</label>
+			</div>
 		</div>
 	</center>
 	<div class="loginAfter"></div>
diff --git a/rainloop/v/0.0.0/themes/Blurred/styles.less b/rainloop/v/0.0.0/themes/Blurred/styles.less
index d1b3b3109..2ae788971 100644
--- a/rainloop/v/0.0.0/themes/Blurred/styles.less
+++ b/rainloop/v/0.0.0/themes/Blurred/styles.less
@@ -17,6 +17,7 @@
 @login-border: none;
 @login-border-radius: 7px;
 @powered-color: #ddd;
+@languages-color: #ddd;
 
 // MENU
 @dropdown-menu-color: #333;
diff --git a/rainloop/v/0.0.0/themes/Default/styles.less b/rainloop/v/0.0.0/themes/Default/styles.less
index 8c0111ed0..907a2d7ae 100644
--- a/rainloop/v/0.0.0/themes/Default/styles.less
+++ b/rainloop/v/0.0.0/themes/Default/styles.less
@@ -16,6 +16,7 @@
 @login-border: none;
 @login-border-radius: 7px;
 @powered-color: #ddd;
+@languages-color: #ddd;
 
 // MENU
 @dropdown-menu-color: #333;
diff --git a/rainloop/v/0.0.0/themes/Love/styles.less b/rainloop/v/0.0.0/themes/Love/styles.less
index ceedaddff..171a7fe20 100644
--- a/rainloop/v/0.0.0/themes/Love/styles.less
+++ b/rainloop/v/0.0.0/themes/Love/styles.less
@@ -16,6 +16,7 @@
 @login-border: none;
 @login-border-radius: 7px;
 @powered-color: #ddd;
+@languages-color: #ddd;
 
 // MENU
 @dropdown-menu-color: #333;
diff --git a/rainloop/v/0.0.0/themes/Snow/styles.less b/rainloop/v/0.0.0/themes/Snow/styles.less
index a8c1119ac..47abc486f 100644
--- a/rainloop/v/0.0.0/themes/Snow/styles.less
+++ b/rainloop/v/0.0.0/themes/Snow/styles.less
@@ -16,6 +16,7 @@
 @login-border: none;
 @login-border-radius: 7px;
 @powered-color: #fff;
+@languages-color: #fff;
 
 // MENU
 @dropdown-menu-color: #333;
diff --git a/rainloop/v/0.0.0/themes/SquaresDark/styles.less b/rainloop/v/0.0.0/themes/SquaresDark/styles.less
index 8c0111ed0..907a2d7ae 100644
--- a/rainloop/v/0.0.0/themes/SquaresDark/styles.less
+++ b/rainloop/v/0.0.0/themes/SquaresDark/styles.less
@@ -16,6 +16,7 @@
 @login-border: none;
 @login-border-radius: 7px;
 @powered-color: #ddd;
+@languages-color: #ddd;
 
 // MENU
 @dropdown-menu-color: #333;
diff --git a/rainloop/v/0.0.0/themes/Stripes/styles.less b/rainloop/v/0.0.0/themes/Stripes/styles.less
index 37a3d2558..0c77e4d97 100644
--- a/rainloop/v/0.0.0/themes/Stripes/styles.less
+++ b/rainloop/v/0.0.0/themes/Stripes/styles.less
@@ -15,6 +15,7 @@
 @login-border: none;
 @login-border-radius: 7px;
 @powered-color: #ddd;
+@languages-color: #ddd;
 
 // MENU
 @dropdown-menu-color: #333;