diff --git a/theme/afterburner/style/afterburner_styles.css b/theme/afterburner/style/afterburner_styles.css
index 6c1b5bd523a..5e2cddbb3a2 100644
--- a/theme/afterburner/style/afterburner_styles.css
+++ b/theme/afterburner/style/afterburner_styles.css
@@ -247,6 +247,11 @@ Course Section Topic & Weekly
     display: none; /* hides topic items title or weekly itens title */
     margin-bottom: 9px;
 }
+/*Login (Login page)*/
+.loginbox .loginform .form-label {width:46%;}
+.dir-rtl .loginbox .loginform .form-label {width:46%;}
+.loginbox .loginform .form-input {width:53%;}
+
 /*
 Login (Front Page)
 -----------------------*/
diff --git a/theme/anomaly/style/general.css b/theme/anomaly/style/general.css
index da2501e5fde..c339f47f556 100644
--- a/theme/anomaly/style/general.css
+++ b/theme/anomaly/style/general.css
@@ -171,6 +171,12 @@ html, body {
     text-align: right;
 }
 
+.dir-ltr .loginbox .loginform .form-label {
+    width: 39%;
+    float: left;
+    text-align: right;
+}
+
 .loginbox .loginform .form-input {
     width: 60%;
     float: right;
diff --git a/theme/base/style/core.css b/theme/base/style/core.css
index 8dac1406d15..1bf2ee47d53 100644
--- a/theme/base/style/core.css
+++ b/theme/base/style/core.css
@@ -268,7 +268,7 @@ input#id_externalurl {direction:ltr;}
 /**
  * Login
  */
-.loginbox {margin:15px;overflow:hidden;}
+.loginbox {margin:15px;overflow:visible;}
 .loginbox.twocolumns {margin:15px;}
 .loginbox h2,
 .loginbox .subcontent {margin:5px;padding:10px;text-align:center;}
@@ -281,8 +281,9 @@ input#id_externalurl {direction:ltr;}
 .loginbox .potentialidps .potentialidplist {margin-left:40%;}
 .loginbox .potentialidps .potentialidplist div {text-align:left;}
 .loginbox .loginform {margin-top:1em;text-align:left;}
-.loginbox .loginform .form-label {float:left;text-align:right;width:40%;}
-.loginbox .loginform .form-input {float:right;width:59%;}
+.loginbox .loginform .form-label {float:left;text-align:right;width:44%;direction:rtl; white-space:nowrap;}
+.dir-rtl .loginbox .loginform .form-label {float:left;text-align:right;width:44%;direction:ltr; white-space:nowrap;}
+.loginbox .loginform .form-input {float:right;width:55%;}
 .loginbox .loginform .form-input input {width: 6em;}
 .loginbox .signupform {margin-top:1em;text-align:center;}
 .loginbox.twocolumns .loginpanel {float:left;width:49.5%;border-right: 1px solid;margin-bottom:-2000px;padding-bottom:2000px;}
diff --git a/theme/canvas/style/core.css b/theme/canvas/style/core.css
index 0431db18e23..490a811fb9c 100644
--- a/theme/canvas/style/core.css
+++ b/theme/canvas/style/core.css
@@ -105,6 +105,12 @@ input[type="radio"] {
 }
 .dir-rtl .loginbox .loginform .form-label {
     text-align: right;
+    direction: rtl;
+}
+
+.loginbox .loginform .form-label {
+    text-align: left;
+    direction: ltr;
 }
 .loginbox .loginform .form-input {
     float: none;
diff --git a/theme/formal_white/style/core.css b/theme/formal_white/style/core.css
index 44e2b7ef89b..a571eb58855 100644
--- a/theme/formal_white/style/core.css
+++ b/theme/formal_white/style/core.css
@@ -118,6 +118,9 @@ input[type="radio"] {
 }
 
 .dir-rtl .loginbox .loginform .form-label {
+    float: none;
+    width: 100%;
+    margin: 0 auto;
     text-align: right;
 }