diff --git a/js/controllers/createProfile.js b/js/controllers/createProfile.js
index 09de0be7e..c4cfa4b20 100644
--- a/js/controllers/createProfile.js
+++ b/js/controllers/createProfile.js
@@ -1,6 +1,6 @@
 'use strict';
 
-angular.module('copayApp.controllers').controller('CreateProfileController', function($scope, $rootScope, $location, $timeout, $window, notification, pluginManager, identityService, pinService, isMobile, configService, go) {
+angular.module('copayApp.controllers').controller('CreateProfileController', function($scope, $rootScope, $location, $timeout, $window, notification, pluginManager, identityService, pinService, isMobile, isCordova, configService, go) {
 
   var _credentials, _firstpin;
 
@@ -77,6 +77,7 @@ angular.module('copayApp.controllers').controller('CreateProfileController', fun
   $scope.setStep = function(step) {
     $scope.error = null;
     $scope.createStep = step;
+    $scope.hideForWP = false;
     $timeout(function() {
       $scope.$digest();
     }, 1);
@@ -84,6 +85,7 @@ angular.module('copayApp.controllers').controller('CreateProfileController', fun
 
   $scope.selectStorage = function(storage) {
     $scope.useLocalstorage = storage == 'local';
+    $scope.hideForWP = false;
     $timeout(function() {
       $scope.$digest();
     }, 1);
@@ -99,6 +101,7 @@ angular.module('copayApp.controllers').controller('CreateProfileController', fun
     preconditions.checkState($scope.userOrEmail);
 
     $scope.error = null;
+    $scope.hideForWP = false;
     $scope.createStep = 'pass';
     $timeout(function() {
       $scope.$digest();
diff --git a/js/controllers/home.js b/js/controllers/home.js
index 357cece40..a1b4ea892 100644
--- a/js/controllers/home.js
+++ b/js/controllers/home.js
@@ -6,7 +6,6 @@ angular.module('copayApp.controllers').controller('HomeController', function($sc
   $scope.init = function() {
     $scope.isMobile = isMobile.any();
     $scope.isWindowsPhoneApp = isMobile.Windows() && isCordova;
-    $scope.isWindowsPhoneApp = 1;
     $scope.hideForWP = 0;
     $scope.attempt = 0;
 
diff --git a/views/createProfile.html b/views/createProfile.html
index f2713ccd1..8abd44750 100644
--- a/views/createProfile.html
+++ b/views/createProfile.html
@@ -113,7 +113,7 @@
 
       <form ng-show="createStep == 'email'" name="emailForm" ng-submit="setEmailOrUsername(emailForm)" novalidate>
         <div class="input" ng-if="useEmail">
-          <input type="email" ng-model="email" class="form-control fi-email" name="email" placeholder="Email" required auto-focus="!isMobile">
+          <input type="email" ng-model="email" class="form-control fi-email" name="email" placeholder="Email" required auto-focus="!isMobile"  ng-focus="formFocus()">
           <i class="icon-email"></i>
           <div class="icon-input" ng-if="useEmail">
             <span translate class="has-error size-12" ng-show="emailForm.email.$invalid &&
@@ -128,7 +128,7 @@
         </div>
 
         <div class="input" ng-if="!useEmail">
-          <input type="text" ng-model="username" class="form-control fi-user" name="username" placeholder="Username" required auto-focus>
+          <input type="text" ng-model="username" class="form-control fi-user" name="username" placeholder="Username" required  auto-focus="!isMobile" ng-focus="formFocus()">
           <i class="icon-person"></i>
         </div>
 
@@ -160,13 +160,13 @@
 
 
         <div class="input">
-          <input id="password" type="password" ng-model="$parent.password" class="form-control" name="password" placeholder="{{'Choose a password'|translate}}" check-strength="passwordStrength" >
+          <input id="password" type="password" ng-model="$parent.password" class="form-control" name="password" placeholder="{{'Choose a password'|translate}}" check-strength="passwordStrength"  ng-focus="formFocus()" >
           <i class="icon-locked"></i>
         </div>
 
 
         <div class="input">
-          <input type="password" ng-model="repeatpassword" class="input form-control" name="repeatpassword" placeholder="{{'Repeat password'|translate}}" match="password" required>
+          <input type="password" ng-model="repeatpassword" class="input form-control" name="repeatpassword" placeholder="{{'Repeat password'|translate}}" match="password" required  ng-focus="formFocus()">
           <i class="icon-locked"></i>
           <div class="icon-input">
             <span translate class="has-error size-12" ng-show="passForm.repeatpassword.$dirty &&
@@ -213,11 +213,11 @@
 
     <form name="setPinForm" novalidate>
       <div class="input" ng-show="askForPin == 1">
-        <input id="newpin" type="tel" ng-model="newpin" class="form-control" ng-maxlength="4" ng-minlength="4" maxlength="4" ng-pattern="/^[0-9]{1,4}$/" placeholder="PIN" name="newpin" required show-focus="askForPin == 1">
+        <input id="newpin" type="tel" ng-model="newpin" class="form-control" ng-maxlength="4" ng-minlength="4" maxlength="4" ng-pattern="/^[0-9]{1,4}$/" placeholder="PIN" name="newpin" required show-focus="askForPin == 1"  ng-focus="formFocus()">
         <i class="icon-locked"></i>
       </div>
       <div class="input" ng-show="askForPin == 2">
-        <input id="repeatpin" type="tel" ng-model="repeatpin" class="form-control" ng-maxlength="4" ng-minlength="4" maxlength="4" ng-pattern="/^[0-9]{1,4}$/" placeholder="Confirm your PIN" name="repeatpin" required show-focus="askForPin == 2">
+        <input id="repeatpin" type="tel" ng-model="repeatpin" class="form-control" ng-maxlength="4" ng-minlength="4" maxlength="4" ng-pattern="/^[0-9]{1,4}$/" placeholder="Confirm your PIN" name="repeatpin" required show-focus="askForPin == 2"  ng-focus="formFocus()">
         <i class="icon-locked"></i>
       </div>