diff --git a/.gitignore b/.gitignore
index a674bf8..be8262c 100644
--- a/.gitignore
+++ b/.gitignore
@@ -14,11 +14,11 @@ gen/
 out/
 
 # Gradle files
-.gradle/
-build/
+.gradle
+/build
 
 # Local configuration file (sdk path, etc)
-local.properties
+/local.properties
 
 # Proguard folder generated by Eclipse
 proguard/
@@ -30,16 +30,17 @@ proguard/
 .navigation/
 
 # Android Studio captures folder
-captures/
+/captures
 
 # Intellij
 *.iml
+/*.iml
 .idea
-.idea/workspace.xml
+/.idea/workspace.xml
 .idea/tasks.xml
 .idea/gradle.xml
 .idea/dictionaries
-.idea/libraries
+/.idea/libraries
 
 # Keystore files
 # Uncomment the following line if you do not want to check your keystore files in.
diff --git a/mifos-passcode/src/main/java/com/mifos/mobile/passcode/MifosPassCodeActivity.java b/mifos-passcode/src/main/java/com/mifos/mobile/passcode/MifosPassCodeActivity.java
index b1842f3..9a32aeb 100644
--- a/mifos-passcode/src/main/java/com/mifos/mobile/passcode/MifosPassCodeActivity.java
+++ b/mifos-passcode/src/main/java/com/mifos/mobile/passcode/MifosPassCodeActivity.java
@@ -106,7 +106,16 @@ public void clearTokenPreferences() {
     }
 
     public void skip(View v) {
-        startHomeActivity();
+        if (isPassCodeVerified) {
+            btnSkip.setText(getString(R.string.skip));
+            btnSave.setText(getString(R.string.proceed));
+            tvPasscodeIntro.setText(getString(R.string.enter_passcode));
+            strPassCodeEntered = "";
+            mifosPassCodeView.clearPasscodeField();
+            isPassCodeVerified = false;
+        } else {
+            startHomeActivity();
+        }
     }
 
     /**
@@ -125,7 +134,7 @@ public void savePassCode(View view) {
                     mifosPassCodeView.clearPasscodeField();
                 }
             } else {
-                btnSkip.setVisibility(View.INVISIBLE);
+                btnSkip.setText(getString(R.string.back));
                 btnSave.setText(getString(R.string.save));
                 tvPasscodeIntro.setText(getString(R.string.reenter_passcode));
                 strPassCodeEntered = mifosPassCodeView.getPasscode();
diff --git a/mifos-passcode/src/main/res/values/strings.xml b/mifos-passcode/src/main/res/values/strings.xml
index 2da772c..49c6c2d 100644
--- a/mifos-passcode/src/main/res/values/strings.xml
+++ b/mifos-passcode/src/main/res/values/strings.xml
@@ -6,6 +6,7 @@
     <string name="incorrect_passcode_more_than_three">You have entered incorrect Passcode more than 3 times</string>
     <string name="skip">Skip</string>
     <string name="save">Save</string>
+    <string name="back">Back</string>
     <string name="proceed">Proceed</string>
     <string name="passcode_setup">Setup a passcode to login</string>
     <string name="reenter_passcode">Please re-enter your passcode</string>