diff --git a/Controleur/ControleurParamreinitmotpass.php b/Controleur/ControleurParamreinitmotpass.php
index 936ab000..28b866e5 100755
--- a/Controleur/ControleurParamreinitmotpass.php
+++ b/Controleur/ControleurParamreinitmotpass.php
@@ -1,5 +1,4 @@
 <?php
-
 require_once 'Framework/Controleur.php';
 require_once 'Modele/Societeuser.php';
 require_once 'Modele/Menuvueutilisateur.php';
@@ -22,21 +21,16 @@ require_once 'Modele/Ouinon.php';
 
     public function index()
     {
-		$codeSociete = $_SESSION['codeSociete'];
+		$codeSociete 				= $_SESSION['codeSociete'];
+		$expressionsinactives		= $this->societeuser->getcompsantepasswordactif("0");
+		$expressionsactives			= $this->societeuser->getcompsantepasswordactif("1");
+		$societeuser 				= $this->societeuser->getVwSocieteuser($codeSociete);
 		
-		$expressionsinactives	= $this->societeuser->getcompsantepasswordactif("0");
-		
-		$expressionsactives	= $this->societeuser->getcompsantepasswordactif("1");
-		
-		$societeuser = $this->societeuser->getVwSocieteuser($codeSociete);
-		
-		//var_dump($societeuser);
-		
-
-        $this->genererVue(array('expressionsinactives' => $expressionsinactives, 
-								'expressionsactives' => $expressionsactives	,
-								'activerOtpouinon' => $this->activerOtpouinon,
-								'societeuser' => $societeuser
+        $this->genererVue(array(
+			'expressionsinactives' 	=> $expressionsinactives, 
+			'expressionsactives' 	=> $expressionsactives	,
+			'activerOtpouinon' 		=> $this->activerOtpouinon,
+			'societeuser' 			=> $societeuser
 		));
     }
 
@@ -48,45 +42,45 @@ require_once 'Modele/Ouinon.php';
 			&& $this->requete->existeParametre("nvmdp") 
 			&& $this->requete->existeParametre("cfnvmdp")) 
 		{
-            $ancmdp = $this->requete->getParametre("ancmdp");
-            $nvmdp = $this->requete->getParametre("nvmdp");
-			$cfnvmdp = $this->requete->getParametre("cfnvmdp");
+            $ancmdp 		= $this->requete->getParametre("ancmdp");
+            $nvmdp 			= $this->requete->getParametre("nvmdp");
+			$cfnvmdp 		= $this->requete->getParametre("cfnvmdp");
 			
-			if ($nvmdp!=$cfnvmdp)
+			if ($nvmdp != $cfnvmdp)
 			{
-				$codeSociete 			= $_SESSION['codeSociete'];
-				$expressionsinactives	= $this->societeuser->getcompsantepasswordactif("0");
+				$codeSociete 				= $_SESSION['codeSociete'];
+				$expressionsinactives		= $this->societeuser->getcompsantepasswordactif("0");
+				$expressionsactives			= $this->societeuser->getcompsantepasswordactif("1");
+				$societeuser 				= $this->societeuser->getVwSocieteuser($codeSociete);
 		
-				$expressionsactives		= $this->societeuser->getcompsantepasswordactif("1");
-				$societeuser 			= $this->societeuser->getVwSocieteuser($codeSociete);
-		
-				$msgErreur = _('Veuillez confirmer le nouveau mot de passe!');
-
+				$msgErreur 	= _('Veuillez confirmer le nouveau mot de passe!');
+				
 				$this->genererVue(array(
 					'expressionsinactives' 	=> $expressionsinactives, 
 					'expressionsactives' 	=> $expressionsactives	,
 					'activerOtpouinon' 		=> $this->activerOtpouinon,
 					'societeuser' 			=> $societeuser,
-					'msgErreur' 			=> $msgErreur
-				));	
+					'msgErreur' 			=> $msgErreur), 
+					"index"
+				);		
 			} 
-			else if ($nvmdp==$ancmdp)			
+			else if ($nvmdp == $ancmdp)			
 			{
-				$codeSociete 			= $_SESSION['codeSociete'];
-				$expressionsinactives	= $this->societeuser->getcompsantepasswordactif("0");
+				$codeSociete 				= $_SESSION['codeSociete'];
+				$expressionsinactives		= $this->societeuser->getcompsantepasswordactif("0");
+				$expressionsactives			= $this->societeuser->getcompsantepasswordactif("1");
+				$societeuser 				= $this->societeuser->getVwSocieteuser($codeSociete);
 		
-				$expressionsactives		= $this->societeuser->getcompsantepasswordactif("1");
-				$societeuser 			= $this->societeuser->getVwSocieteuser($codeSociete);
-		
-				$msgErreur = _('Veuillez changer le mot de passe!');
-
+				$msgErreur  = _('Veuillez changer le mot de passe!');
+				
 				$this->genererVue(array(
 					'expressionsinactives' 	=> $expressionsinactives, 
 					'expressionsactives' 	=> $expressionsactives	,
 					'activerOtpouinon' 		=> $this->activerOtpouinon,
 					'societeuser' 			=> $societeuser,
-					'msgErreur' 			=> $msgErreur
-				));	
+					'msgErreur' 			=> $msgErreur), 
+					"index"
+				);			
 			} 
 			else if ($this->societeuser->verifiermotpass($codeSociete, $ancmdp))				
 			{
@@ -95,56 +89,59 @@ require_once 'Modele/Ouinon.php';
 			} 
 			else
 			{	
-				$codeSociete 			= $_SESSION['codeSociete'];
-				$expressionsinactives	= $this->societeuser->getcompsantepasswordactif("0");
+				$codeSociete 				= $_SESSION['codeSociete'];
+				$expressionsinactives		= $this->societeuser->getcompsantepasswordactif("0");
+				$expressionsactives			= $this->societeuser->getcompsantepasswordactif("1");
+				$societeuser 				= $this->societeuser->getVwSocieteuser($codeSociete);
 		
-				$expressionsactives		= $this->societeuser->getcompsantepasswordactif("1");
-				$societeuser 			= $this->societeuser->getVwSocieteuser($codeSociete);
-		
-				$msgErreur = _('Ancien mot de passe incorrect!');
-
+				$msgErreur 	= _('Ancien mot de passe incorrect!');
+				
 				$this->genererVue(array(
 					'expressionsinactives' 	=> $expressionsinactives, 
 					'expressionsactives' 	=> $expressionsactives	,
 					'activerOtpouinon' 		=> $this->activerOtpouinon,
 					'societeuser' 			=> $societeuser,
-					'msgErreur' 			=> $msgErreur
-				));		
+					'msgErreur' 			=> $msgErreur), 
+					"index"
+				);		
 			}
         }
         else
 		{
-			$codeSociete 			= $_SESSION['codeSociete'];
-			$expressionsinactives	= $this->societeuser->getcompsantepasswordactif("0");
-	
-			$expressionsactives		= $this->societeuser->getcompsantepasswordactif("1");
-			$societeuser 			= $this->societeuser->getVwSocieteuser($codeSociete);
-	
+			$codeSociete 				= $_SESSION['codeSociete'];
+			$expressionsinactives		= $this->societeuser->getcompsantepasswordactif("0");
+			$expressionsactives			= $this->societeuser->getcompsantepasswordactif("1");
+			$societeuser 				= $this->societeuser->getVwSocieteuser($codeSociete);
+		
 			$msgErreur = _('Veuillez revoir votre saisie!');
-
+			
 			$this->genererVue(array(
 				'expressionsinactives' 	=> $expressionsinactives, 
 				'expressionsactives' 	=> $expressionsactives	,
 				'activerOtpouinon' 		=> $this->activerOtpouinon,
 				'societeuser' 			=> $societeuser,
-				'msgErreur' 			=> $msgErreur
-			));	
+				'msgErreur' 			=> $msgErreur), 
+				"index"
+			);	
 		}
     }
 	
     public function majcomplexitepassword() 
 	{
-		$idExpression	= $this->requete->getParametreFormulaire("idExpression");
-		$actif			= $this->requete->getParametreFormulaire("actif");
+		$idExpression				= $this->requete->getParametreFormulaire("idExpression");
+		$actif						= $this->requete->getParametreFormulaire("actif");
 		
 		$this->societeuser->majcomplexitepassword($idExpression , $actif);
 		
-		$expressionsinactives	= $this->societeuser->getcompsantepasswordactif("0");
+		$expressionsinactives		= $this->societeuser->getcompsantepasswordactif("0");
 		
-		$expressionsactives	= $this->societeuser->getcompsantepasswordactif("1");
+		$expressionsactives			= $this->societeuser->getcompsantepasswordactif("1");
 
-        $this->genererVueAjax(array('expressionsinactives' => $expressionsinactives, 'expressionsactives' => $expressionsactives));
-   }
+        $this->genererVueAjax(array(
+			'expressionsinactives' 	=> $expressionsinactives, 
+			'expressionsactives' 	=> $expressionsactives
+		));
+    }