diff --git a/app/css/app.css b/app/css/app.css
index a9051b24..78e56e2a 100644
--- a/app/css/app.css
+++ b/app/css/app.css
@@ -788,6 +788,9 @@ a.tg_radio_on:hover i.icon-radio {
 .login_phone_number {
   width: 198px;
 }
+.login_phone_code {
+  text-align: center;
+}
 .login_first_name_wrap {
   margin-bottom: 11px;
 }
diff --git a/app/js/controllers.js b/app/js/controllers.js
index 8fa9163e..ed58abab 100644
--- a/app/js/controllers.js
+++ b/app/js/controllers.js
@@ -59,7 +59,7 @@ angular.module('myApp.controllers', [])
     function initPhoneCountry () {
       var langCode = (navigator.language || '').toLowerCase(),
           countryIso2 = Config.LangCountries[langCode],
-          shouldPregenerate = !Config.Mobile;
+          shouldPregenerate = !Config.Navigator.mobile;
 
       if (['en', 'en-us', 'en-uk'].indexOf(langCode) == -1) {
         if (countryIso2 !== undefined) {
diff --git a/app/partials/desktop/login.html b/app/partials/desktop/login.html
index 143dfc92..8f1a8b45 100644
--- a/app/partials/desktop/login.html
+++ b/app/partials/desktop/login.html
@@ -52,7 +52,7 @@
 
     <div class="form-group" ng-class="{'has-error': error.field == 'phone_code'}">
       <label class="control-label" for="phone_code" ng-if="error.field == 'phone_code'">Incorrect SMS code</label>
-      <input type="number" my-focused class="form-control" name="phone_code" ng-model="credentials.phone_code" placeholder="Enter your code" autocomplete="off" required>
+      <input type="number" my-focused class="form-control login_phone_code" name="phone_code" ng-model="credentials.phone_code" placeholder="Enter your code" autocomplete="off" required>
     </div>
 
     <button class="btn btn-primary btn-block" type="submit" ng-class="{disabled: progress.enabled}" ng-disabled="progress.enabled" ng-switch="progress.enabled">
diff --git a/app/partials/mobile/country_select_modal.html b/app/partials/mobile/country_select_modal.html
index 761219f7..1610ed1a 100644
--- a/app/partials/mobile/country_select_modal.html
+++ b/app/partials/mobile/country_select_modal.html
@@ -30,7 +30,7 @@
       <a class="countries_modal_search_clear" ng-click="search.query = ''" ng-show="search.query.length"></a>
     </div>
 
-    <div class="countries_modal_col countries_wrap countries_scrollable_wrap" my-countries-list-mobile my-infinite-scroller-mobile>
+    <div class="countries_modal_col countries_wrap countries_scrollable_wrap mobile_scrollable_wrap" my-countries-list-mobile my-infinite-scroller-mobile>
       <ul class="countries_modal_members_list nav nav-pills nav-stacked">
 
         <li class="countries_modal_country_wrap clearfix" ng-repeat="country in countries | limitTo : slice.limit track by $index">
diff --git a/app/partials/mobile/login.html b/app/partials/mobile/login.html
index 143dfc92..8f1a8b45 100644
--- a/app/partials/mobile/login.html
+++ b/app/partials/mobile/login.html
@@ -52,7 +52,7 @@
 
     <div class="form-group" ng-class="{'has-error': error.field == 'phone_code'}">
       <label class="control-label" for="phone_code" ng-if="error.field == 'phone_code'">Incorrect SMS code</label>
-      <input type="number" my-focused class="form-control" name="phone_code" ng-model="credentials.phone_code" placeholder="Enter your code" autocomplete="off" required>
+      <input type="number" my-focused class="form-control login_phone_code" name="phone_code" ng-model="credentials.phone_code" placeholder="Enter your code" autocomplete="off" required>
     </div>
 
     <button class="btn btn-primary btn-block" type="submit" ng-class="{disabled: progress.enabled}" ng-disabled="progress.enabled" ng-switch="progress.enabled">