diff --git a/js/services/pinService.js b/js/services/pinService.js
index fa20c78c2..11f66469d 100644
--- a/js/services/pinService.js
+++ b/js/services/pinService.js
@@ -64,6 +64,7 @@ angular.module('copayApp.services')
if (!$rootScope.hasPin) {
if (!_firstpin) {
_firstpin = pin;
+ $rootScope.askForPin = 2;
$timeout(function() {
scope.clear();
}, 100);
@@ -71,10 +72,13 @@ angular.module('copayApp.services')
}
else {
if (pin === _firstpin) {
+ _firstpin = null;
+ $rootScope.askForPin = null;
scope.createPin(pin);
}
else {
_firstpin = null;
+ $rootScope.askForPin = 1;
$timeout(function() {
scope.clear();
scope.error = 'Entered PINs were not equal. Try again';
diff --git a/views/createProfile.html b/views/createProfile.html
index 4ad11e872..0b1b05d23 100644
--- a/views/createProfile.html
+++ b/views/createProfile.html
@@ -213,6 +213,7 @@
+