diff --git a/tests/p_passwd/_user_password.expect b/tests/p_passwd/_user_password.expect
index 4629858..e0dac1e 100755
--- a/tests/p_passwd/_user_password.expect
+++ b/tests/p_passwd/_user_password.expect
@@ -6,19 +6,29 @@ match_max 6000
 spawn su passtest -c passwd
 expect  -re "(UNIX|Current) password:" { send -- "passtest\r" }
 expect { 
-         "You must wait longer to change your password" 
-             {
-              exit 2 
-             }
-         "Authentication token manipulation error"
-             {
-              exit 3
-             }
-         "password:" 
-             {
-              send -- "ano24ther\r"
-              expect "*?password:*"
-              send -- "ano24ther\r"
-              expect eof 
-             }
-       }
+	 "You must wait longer to change your password" 
+	     {
+	      exit 2 
+	     }
+	 "Authentication token manipulation error"
+	     {
+	      exit 3
+	     }
+	 "Current Password:" { 
+	      send -- "passtest\r"    
+              expect {
+		"Authentication token manipulation error"
+	        {
+	         exit 3
+	        }
+	     }
+	 }
+	 "password:" 
+	     {
+	      send -- "ano24ther\r"
+	      expect "*?\[pP]assword:*"
+	      send -- "ano24ther\r"
+	      expect eof 
+	     }
+}
+