diff --git a/oauth/connexion.php b/oauth/connexion.php
index 57edba1..ece65b0 100644
--- a/oauth/connexion.php
+++ b/oauth/connexion.php
@@ -20,13 +20,18 @@ else
 	// Check received data length (to prevent code injection) 
 	if (strlen($_POST['user']) > 15)
  	{
-  		echo 'Username has incorrect format ... Please try again<br /><br />';
+  		echo 'Usernameis longer than 15 characters ... Please try again<br /><br />';
 		echo 'Click <a href="./index.php">here</a> to come back to login page';
     }
-    elseif (strlen($_POST['password']) > 50 || strlen($_POST['password']) <= 7)
+    elseif (strlen($_POST['password']) > 50)
     {
-    	echo 'Password has incorrect format ... Please try again<br /><br />';
-		echo 'Click <a href="./index.php">here</a> to come back to login page';
+	echo 'Password is longer than 50 characters ... Please try again<br /><br />';
+	echo 'Click <a href="./index.php">here</a> to come back to login page';
+
+    } elseif (strlen($_POST['password']) <= 7)
+    {
+    	echo 'Password is shorter than 7 characters ... Please try again<br /><br />';
+	echo 'Click <a href="./index.php">here</a> to come back to login page';
     } 
     else
    	{