diff --git a/client/WEB-INF/classes/resources/messages.properties b/client/WEB-INF/classes/resources/messages.properties
index bc1e43692a3..459a4edad22 100644
--- a/client/WEB-INF/classes/resources/messages.properties
+++ b/client/WEB-INF/classes/resources/messages.properties
@@ -14,6 +14,7 @@
 # KIND, either express or implied.  See the License for the
 # specific language governing permissions and limitations
 # under the License.
+label.use.default.language=Use default language
 label.delete.events=Delete events
 label.delete.alerts=Delete alerts
 label.archive.alerts=Archive alerts
diff --git a/ui/dictionary.jsp b/ui/dictionary.jsp
index 15c199964b3..d88a8990a85 100644
--- a/ui/dictionary.jsp
+++ b/ui/dictionary.jsp
@@ -25,6 +25,7 @@ under the License.
 <% long now = System.currentTimeMillis(); %>
 <script language="javascript">
 dictionary = {
+'label.use.default.language': '<fmt:message key="label.use.default.language" />',
 'label.delete.events': '<fmt:message key="label.delete.events" />',
 'label.delete.alerts': '<fmt:message key="label.delete.alerts" />',
 'label.archive.events': '<fmt:message key="label.archive.events" />',
diff --git a/ui/index.jsp b/ui/index.jsp
index ed1ff3f6e55..5fd63b8c3a2 100644
--- a/ui/index.jsp
+++ b/ui/index.jsp
@@ -61,7 +61,7 @@ under the License.
             <!-- Select language -->
             <div class="select-language">
               <select name="language">
-                <option value=""></option> <!-- when this blank option is selected, browser's default language will be used -->
+                <option value=""><fmt:message key="label.use.default.language"/></option> <!-- when this blank option is selected, browser's default language will be used -->
                 <option value="en"><fmt:message key="label.lang.english"/></option>
                 <option value="ja"><fmt:message key="label.lang.japanese"/></option>
                 <option value="zh_CN"><fmt:message key="label.lang.chinese"/></option>
diff --git a/ui/stylesheets/csui/_login.scss b/ui/stylesheets/csui/_login.scss
index 8f23b901548..f052df105b9 100644
--- a/ui/stylesheets/csui/_login.scss
+++ b/ui/stylesheets/csui/_login.scss
@@ -21,11 +21,10 @@
     padding-bottom: 60px;
     position: relative;
     top: 15%;
-    height: 400px;
 
     .logo {
       @include shift(2);
-      @include span-columns(4);
+      @include span-columns(3);
 
       background: url(csui/img/logo-main.png) no-repeat top center;
       background-size: contain;
@@ -34,10 +33,9 @@
     }
 
     .fields {
-      @include shift(3);
       @include span-columns(3);
+      @include shift(1);
 
-      margin: auto;
       color: white;
 
       input[type=text],
@@ -63,7 +61,11 @@
         @include csui-dropdown-dark;
 
         width: 100%;
-        margin-top: 20px;
+        margin-top: 50px;
+      }
+
+      label {
+          font-size: 12px;
       }
     }
   }