diff --git a/admin/user.php b/admin/user.php
index 8de47a6..7f5a113 100644
--- a/admin/user.php
+++ b/admin/user.php
@@ -35,11 +35,7 @@ if ($user->isAdmin()) {
 		}
 		if (isset($_POST["btnVerifyUser"])) {
 			unset($_POST["btnVerifyUser"]);
-		}
-		if (isset($_POST["password"])) {
-			$_POST["password"] = md5($_POST["password"]);
-		}
-		
+		}		
 		if (isset($_POST["id_user"])) {
 			$user->modifyUser($_POST, $_POST["id_user"]);
 		} else {			
diff --git a/classes/user.class.php b/classes/user.class.php
index afdbf29..1913e7a 100644
--- a/classes/user.class.php
+++ b/classes/user.class.php
@@ -87,8 +87,10 @@ class user extends Conexion_Mysql {
 	function addUser($fieldsArray) {
 		if ($this->ejecutarConsulta("SELECT id_user FROM ".$this->conf->tablePrefix."users WHERE login='".$fieldsArray['login']."'")) {
 			if ($this->contarRegistros()==0) {
+				$realPassword = ($fieldsArray["password"]);
+				$fieldsArray["password"] = md5($fieldsArray["password"]);
 				if ($this->insertarDeFormulario($this->conf->tablePrefix."users", $fieldsArray)) {
-					$this->confirmationEmail($fieldsArray['email'], $fieldsArray['login'], $fieldsArray['password']);
+					$this->confirmationEmail($fieldsArray['email'], $fieldsArray['login'], $realPassword);
 					header("Location: ".$this->conf->urlGelato."/admin/admin.php?added=true");
 					die();
 				} else {
@@ -103,6 +105,7 @@ class user extends Conexion_Mysql {
 	}
 
 	function modifyUser($fieldsArray, $id_user) {
+		$fieldsArray["password"] = md5($fieldsArray["password"]);
 		if ($this->modificarDeFormulario($this->conf->tablePrefix."users", $fieldsArray, "id_user=$id_user")) {
 			header("Location: ".$this->conf->urlGelato."/admin/admin.php?modified=true");
 			die();