diff --git a/CHANGELOG b/CHANGELOG
index f3cf6cdb..6878922f 100644
--- a/CHANGELOG
+++ b/CHANGELOG
@@ -1,12 +1,3 @@
-=== ** v1.0rc3 ** ===
-
-* [BUG] Corregidos fallos en la comprobación de actualizaciones.
-* [BUG] Corregido error al borrar grupos.
-* [MOD] Cambio de fancybox por alertify para los mensajes que no requieren de bloqueo.
-* [MOD] Ecribir versión en BD y archivo de configuración.
-* [MOD] Añadir scroll en resultados de cuentas, usuarios, grupos y perfiles.
-* [MOD] Actualizadas las traducciones.
-
 === ** v1.0rc2 ** ===
 
 * [MOD] Mejor manejo de peticiones GET/POST.
@@ -118,15 +109,6 @@
 
 ---
 
-=== ** v1.0rc3 ** ===
-
-* [BUG] Fix updates checking.
-* [BUG] Fix error on removing groups.
-* [MOD] Change fancybox to alertify for non-locking messages.
-* [MOD] Set version string in DB and config file
-* [MOD] Update translations
-* [MOD] Add scroll to search, users, groups and profiles results.
-
 === ** v1.0rc2 ** ===
 
 * [MOD] Better GET/POST variable handling.
diff --git a/ajax/ajax_checkupds.php b/ajax/ajax_checkupds.php
index a0637745..1d7bbddb 100644
--- a/ajax/ajax_checkupds.php
+++ b/ajax/ajax_checkupds.php
@@ -28,7 +28,7 @@ include_once (APP_ROOT."/inc/init.php");
 
 SP_Util::checkReferer('GET');
 
-$checkVersion = SP_Common::parseParams('s', 'UPDATED', FALSE, TRUE);
+$checkVersion = SP_Common::parseParams('s', 'UPDATED', FALSE);
 
 // Una vez por sesión
 if ( ! $checkVersion ){
diff --git a/css/alertify.core.css b/css/alertify.core.css
deleted file mode 100644
index 12d82dd2..00000000
--- a/css/alertify.core.css
+++ /dev/null
@@ -1,137 +0,0 @@
-.alertify,
-.alertify-show,
-.alertify-log {
-	-webkit-transition: all 500ms cubic-bezier(0.175, 0.885, 0.320, 1.275);
-	   -moz-transition: all 500ms cubic-bezier(0.175, 0.885, 0.320, 1.275);
-	    -ms-transition: all 500ms cubic-bezier(0.175, 0.885, 0.320, 1.275);
-	     -o-transition: all 500ms cubic-bezier(0.175, 0.885, 0.320, 1.275);
-	        transition: all 500ms cubic-bezier(0.175, 0.885, 0.320, 1.275); /* easeOutBack */
-}
-.alertify-hide {
-	-webkit-transition: all 250ms cubic-bezier(0.600, -0.280, 0.735, 0.045);
-	   -moz-transition: all 250ms cubic-bezier(0.600, -0.280, 0.735, 0.045);
-	    -ms-transition: all 250ms cubic-bezier(0.600, -0.280, 0.735, 0.045);
-	     -o-transition: all 250ms cubic-bezier(0.600, -0.280, 0.735, 0.045);
-	        transition: all 250ms cubic-bezier(0.600, -0.280, 0.735, 0.045); /* easeInBack */
-}
-.alertify-log-hide {
-	-webkit-transition: all 500ms cubic-bezier(0.600, -0.280, 0.735, 0.045);
-	   -moz-transition: all 500ms cubic-bezier(0.600, -0.280, 0.735, 0.045);
-	    -ms-transition: all 500ms cubic-bezier(0.600, -0.280, 0.735, 0.045);
-	     -o-transition: all 500ms cubic-bezier(0.600, -0.280, 0.735, 0.045);
-	        transition: all 500ms cubic-bezier(0.600, -0.280, 0.735, 0.045); /* easeInBack */
-}
-.alertify-cover {
-	position: fixed; z-index: 99999;
-	top: 0; right: 0; bottom: 0; left: 0;
-	background-color:white;
-	filter:alpha(opacity=0);
-	opacity:0;
-}
-	.alertify-cover-hidden {
-		display: none;
-	}
-.alertify {
-	position: fixed; z-index: 99999;
-	top: 50px; left: 50%;
-	width: 550px;
-	margin-left: -275px;
-	opacity: 1;
-}
-	.alertify-hidden {
-		-webkit-transform: translate(0,-150px);
-		   -moz-transform: translate(0,-150px);
-		    -ms-transform: translate(0,-150px);
-		     -o-transform: translate(0,-150px);
-		        transform: translate(0,-150px);
-		opacity: 0;
-		display: none;
-	}
-	/* overwrite display: none; for everything except IE6-8 */
-	:root *> .alertify-hidden {
-		display: block;
-		visibility: hidden;
-	}
-.alertify-logs {
-	position: fixed;
-	z-index: 5000;
-	bottom: 10px;
-	right: 10px;
-	width: 300px;
-}
-.alertify-logs-hidden {
-	display: none;
-}
-	.alertify-log {
-		display: block;
-		margin-top: 10px;
-		position: relative;
-		right: -300px;
-		opacity: 0;
-	}
-	.alertify-log-show {
-		right: 0;
-		opacity: 1;
-	}
-	.alertify-log-hide {
-		-webkit-transform: translate(300px, 0);
-		   -moz-transform: translate(300px, 0);
-		    -ms-transform: translate(300px, 0);
-		     -o-transform: translate(300px, 0);
-		        transform: translate(300px, 0);
-		opacity: 0;
-	}
-	.alertify-dialog {
-		padding: 25px;
-	}
-		.alertify-resetFocus {
-			border: 0;
-			clip: rect(0 0 0 0);
-			height: 1px;
-			margin: -1px;
-			overflow: hidden;
-			padding: 0;
-			position: absolute;
-			width: 1px;
-		}
-		.alertify-inner {
-			text-align: center;
-		}
-		.alertify-text {
-			margin-bottom: 15px;
-			width: 100%;
-			-webkit-box-sizing: border-box;
-			   -moz-box-sizing: border-box;
-			        box-sizing: border-box;
-			font-size: 100%;
-		}
-		.alertify-buttons {
-		}
-			.alertify-button,
-			.alertify-button:hover,
-			.alertify-button:active,
-			.alertify-button:visited {
-				background: none;
-				text-decoration: none;
-				border: none;
-				/* line-height and font-size for input button */
-				line-height: 1.5;
-				font-size: 100%;
-				display: inline-block;
-				cursor: pointer;
-				margin-left: 5px;
-			}
-
-@media only screen and (max-width: 680px) {
-	.alertify,
-	.alertify-logs {
-		width: 90%;
-		-webkit-box-sizing: border-box;
-		   -moz-box-sizing: border-box;
-		        box-sizing: border-box;
-	}
-	.alertify {
-		left: 5%;
-		margin: 0;
-	}
-}
diff --git a/css/alertify.default.css b/css/alertify.default.css
deleted file mode 100644
index e6e3d89f..00000000
--- a/css/alertify.default.css
+++ /dev/null
@@ -1,82 +0,0 @@
-/**
- * Default Look and Feel
- */
-.alertify,
-.alertify-log {
-	font-family: sans-serif;
-}
-.alertify {
-    background: #FFF;
-    border: 10px solid #333; /* browsers that don't support rgba */
-    border: 10px solid rgba(0,0,0,.7);
-    border-radius: 8px;
-    box-shadow: 0 3px 3px rgba(0,0,0,.3);
-    -webkit-background-clip: padding;     /* Safari 4? Chrome 6? */
-    -moz-background-clip: padding;     /* Firefox 3.6 */
-    background-clip: padding-box; /* Firefox 4, Safari 5, Opera 10, IE 9 */
-}
-.alertify-text {
-    border: 1px solid #CCC;
-    padding: 10px;
-    border-radius: 4px;
-}
-.alertify-button {
-    border-radius: 4px;
-    color: #FFF;
-    font-weight: bold;
-    padding: 6px 15px;
-    text-decoration: none;
-    text-shadow: 1px 1px 0 rgba(0,0,0,.5);
-    box-shadow: inset 0 1px 0 0 rgba(255,255,255,.5);
-    background-image: -webkit-linear-gradient(top, rgba(255,255,255,.3), rgba(255,255,255,0));
-    background-image:    -moz-linear-gradient(top, rgba(255,255,255,.3), rgba(255,255,255,0));
-    background-image:     -ms-linear-gradient(top, rgba(255,255,255,.3), rgba(255,255,255,0));
-    background-image:      -o-linear-gradient(top, rgba(255,255,255,.3), rgba(255,255,255,0));
-    background-image:         linear-gradient(top, rgba(255,255,255,.3), rgba(255,255,255,0));
-}
-.alertify-button:hover,
-.alertify-button:focus {
-    outline: none;
-    background-image: -webkit-linear-gradient(top, rgba(0,0,0,.1), rgba(0,0,0,0));
-    background-image:    -moz-linear-gradient(top, rgba(0,0,0,.1), rgba(0,0,0,0));
-    background-image:     -ms-linear-gradient(top, rgba(0,0,0,.1), rgba(0,0,0,0));
-    background-image:      -o-linear-gradient(top, rgba(0,0,0,.1), rgba(0,0,0,0));
-    background-image:         linear-gradient(top, rgba(0,0,0,.1), rgba(0,0,0,0));
-}
-.alertify-button:focus {
-    box-shadow: 0 0 15px #2B72D5;
-}
-.alertify-button:active {
-    position: relative;
-    box-shadow: inset 0 2px 4px rgba(0,0,0,.15), 0 1px 2px rgba(0,0,0,.05);
-}
-.alertify-button-cancel,
-.alertify-button-cancel:hover,
-.alertify-button-cancel:focus {
-    background-color: #FE1A00;
-    border: 1px solid #D83526;
-}
-.alertify-button-ok,
-.alertify-button-ok:hover,
-.alertify-button-ok:focus {
-    background-color: #5CB811;
-    border: 1px solid #3B7808;
-}
-
-.alertify-log {
-    background: #1F1F1F;
-    background: rgba(0,0,0,.9);
-    padding: 15px;
-    border-radius: 4px;
-    color: #FFF;
-    font-weight: bold;
-    text-shadow: -1px -1px 0 rgba(0,0,0,.5);
-}
-.alertify-log-error {
-    background: #FE1A00;
-    background: rgba(254,26,0,.9);
-}
-.alertify-log-success {
-    background: #5CB811;
-    background: rgba(92,184,17,.9);
-}
\ No newline at end of file
diff --git a/css/styles.css b/css/styles.css
index c30cd24d..b638bb3a 100644
--- a/css/styles.css
+++ b/css/styles.css
@@ -244,12 +244,8 @@ A:focus {text-decoration: none;	color: #FF0000;}
 
 #content #tblTools{width: 100%; height: 5em; padding-left: 15px;padding: 5px;}
 
-#content #resBuscar{ width: 100%; margin-top: 20px;}
+#content #resBuscar{ width: 100%; margin-top: 20px; min-height: 500px;}
 #content #resBuscar IMG {vertical-align:middle;}
-#content #resBuscar #data-search, 
-#content .data-rows,
-#content #resEventLog #resSearch
-{overflow-y: auto; max-height: 400px}
 
 #content #pageNav {
     float: left;
@@ -718,16 +714,6 @@ A:focus {text-decoration: none;	color: #FF0000;}
 #passLevel.good, #passLevel.good:hover { background-color: #FFF2D9 !important; color: orange; font-weight: bold; border: #ffe5b3 1px solid;}
 #passLevel.weak, #passLevel.weak:hover { background-color: #fee8e6 !important; color: #CC0000;  font-weight: bold; border: #fed2ce 1px solid;}
 
-#alert #alert-text{margin: 15px auto; font-size: 14px; font-weight: bold;}
-#alert #alert-pass{
-    width: 50%;
-    padding: 10px;
-    margin: 15px auto;
-    border: 1px solid #c9c9c9;
-    color: #555;
-    font-weight: bold;
-}
-
 /*Login Page*/
 #boxLogin{
     width:450px;
diff --git a/inc/config.class.php b/inc/config.class.php
index e429b379..66f6b2f3 100644
--- a/inc/config.class.php
+++ b/inc/config.class.php
@@ -49,14 +49,14 @@ class SP_Config{
     static $arrConfigValue;
 
     /**
-     * @brief Obtiene un valor desde la configuración en la BBDD
-     * @param string $param con el parámetro de configuración
-     * @return string con el valor
+     * @brief Obtener en valor de un parámetro
+     * @param string $strConfigParam parámetro
+     * @return string valor
      *
      * Obtener el valor de un parámetro almacenado en la BBDD
      */
-    public static function getConfigValue($param){
-        $query = "SELECT config_value FROM config WHERE config_parameter = '$param'";
+    public static function getConfigValue($strConfigParam){
+        $query = "SELECT config_value FROM config WHERE config_parameter = '$strConfigParam'";
         $queryRes = DB::getResults($query, __FUNCTION__);
 
         if ( $queryRes === FALSE || ! is_array($queryRes) ){
@@ -65,7 +65,7 @@ class SP_Config{
         
         return $queryRes[0]->config_value;
     }
-    
+
     /**
      * @brief Obtener array con la configuración
      *
@@ -122,34 +122,7 @@ class SP_Config{
         
         return TRUE;
     }   
-
-    /**
-     * @brief Guardar un parámetro de configuración
-     * @param string $param con el parámetro a guardar
-     * @param string $value con el calor a guardar
-     * @return bool
-     */
-    public static function setConfigValue($param, $value) {
-        $query = "INSERT INTO config "
-                . "SET config_parameter = '" . DB::escape($param) . "',"
-                . "config_value = '" . DB::escape($value) . "'"
-                . "ON DUPLICATE KEY UPDATE config_value = '" . DB::escape($value) . "' ";
-
-        if (DB::doQuery($query, __FUNCTION__) === FALSE) {
-            return FALSE;
-        }
-
-        $message['action'] = _('Configuración');
-        $message['text'][] = _('Modificar configuración');
-        $message['text'][] = _('Parámetro') . ': ' . $param;
-        $message['text'][] = _('Valor') . ': ' . $value;
-
-        SP_Common::wrLogInfo($message);
-        SP_Common::sendEmail($message);
-
-        return TRUE;
-    }
-
+    
     /**
      * @brief Cargar la configuración desde la BBDD
      * @param bool $force reescribir la variable global $CFG?
@@ -380,6 +353,22 @@ class SP_Config{
         return TRUE;
     }
     
+    /**
+     * @brief Obtiene un valor desde la configuración en la BBDD
+     * @param $param string con el parámetro de configuración
+     * @return array or false
+     */    
+    public static function getConfigParameter($param){
+        $query = "SELECT config_value FROM config WHERE config_parameter = '$param' ";
+        $queryRes = DB::getResults($query, __FUNCTION__);
+        
+        if ( $queryRes === FALSE || ! is_array($queryRes) ){
+            return FALSE;
+        }
+        
+        return $queryRes;
+    }
+    
     /**
      * @brief Establece los valores de configuración por defecto en config.php
      * @return none
diff --git a/inc/html.class.php b/inc/html.class.php
index 1aa09f84..064f15b7 100644
--- a/inc/html.class.php
+++ b/inc/html.class.php
@@ -303,8 +303,6 @@ class SP_Html {
             array("href" => "css/jquery.powertip.css", "media" => "screen"),
             array("href" => "css/jquery.powertip-yellow.min.css", "media" => "screen"),
             array("href" => "css/chosen.css", "media" => "screen"),
-            array("href" => "css/alertify.core.css", "media" => "screen"),
-            array("href" => "css/alertify.default.css", "media" => "screen"),
             array("href" => "js/fancybox/jquery.fancybox.css", "media" => "screen"),
             array("href" => "css/styles.css", "media" => ""));
 
@@ -328,7 +326,6 @@ class SP_Html {
             array("src" => "js/fancybox/jquery.fancybox.pack.js", "params" => ""),
             array("src" => "js/jquery.powertip.min.js", "params" => ""),
             array("src" => "js/chosen.jquery.min.js", "params" => ""),
-            array("src" => "js/alertify.min.js", "params" => ""),
             array("src" => "js/functions.php", "params" => "&l=" . SP_Init::$LANG . "&r=" . base64_encode(SP_Init::$WEBROOT)));
 
         foreach ($jsProp as $js) {
diff --git a/inc/init.php b/inc/init.php
index b3ef7fe2..1b38347e 100644
--- a/inc/init.php
+++ b/inc/init.php
@@ -118,8 +118,6 @@ class SP_Init {
         
         // Comprobar si el modo mantenimiento está activado
         self::checkMaintenanceMode();
-        // Comprobar la versión y actualizarla
-        self::checkVersion();
         // Inicializar la sesión
         self::initSession();
 
@@ -405,36 +403,6 @@ class SP_Init {
         textdomain("messages");
         bind_textdomain_codeset("messages", 'UTF-8');
     }
-    
-    /**
-     * @brief Comrpueba y actualiza la versión de la aplicación
-     * @returns none
-     */
-    private static function checkVersion(){
-        $update = FALSE;
-        $configVersion = SP_Config::getValue('version');
-        $databaseVersion = SP_Config::getConfigValue('version');
-        $appVersion = SP_Util::getVersionString();
-        
-        if ( $configVersion != $appVersion ){
-            SP_Config::setValue('version', $appVersion);
-            $update = TRUE;
-        }
-
-        if ( $databaseVersion != $appVersion ){
-            SP_Config::setConfigValue('version', $appVersion);
-            $update = TRUE;
-        }
-
-        if ( $update === TRUE ){
-            $message['action'] = _('Actualización');
-            $message['text'][] = _('Actualización de versión realizada.');
-            $message['text'][] = _('Versión') . ': ' . $appVersion;
-
-            SP_Common::wrLogInfo($message);
-            SP_Common::sendEmail($message);
-        }
-    }
 }
 
 // Empezar a calcular el tiempo y memoria utilizados
diff --git a/inc/locales/en_US/LC_MESSAGES/messages.mo b/inc/locales/en_US/LC_MESSAGES/messages.mo
index fbab3ce1..7a143eb4 100644
Binary files a/inc/locales/en_US/LC_MESSAGES/messages.mo and b/inc/locales/en_US/LC_MESSAGES/messages.mo differ
diff --git a/inc/tpl/search.php b/inc/tpl/search.php
index 02f258d7..7f852268 100644
--- a/inc/tpl/search.php
+++ b/inc/tpl/search.php
@@ -52,6 +52,7 @@ $categoriesSelProp = array("name" => "category",
                 <label FOR="txtSearch"></label>
                 <input type="text" name="search" id="txtSearch" onKeyUp="accSearch(1)" value="<? echo SP_Account::$accountSearchTxt; ?>" placeholder="<? echo _('Texto a buscar'); ?>"/>
                 <img src="imgs/clear.png" title="<? echo _('Limpiar'); ?>" class="inputImg" id="btnLimpiar" onClick="Clear('frmSearch', 1); accSearch(0);" />
+                <!--<img src="imgs/search.png" title="<? echo _('Buscar'); ?>" class="inputImg" id="btnBuscar" onClick="accSearch(0);" />-->
                 <input type="hidden" name="start" value="0">
                 <input type="hidden" name="skey" value="<? echo SP_Account::$accountSearchKey; ?>" />
                 <input type="hidden" name="sorder" value="<? echo SP_Account::$accountSearchOrder; ?>" />
@@ -64,12 +65,16 @@ $categoriesSelProp = array("name" => "category",
             </td>
             <td id="toolsRight">
                 <input type="text" name="rpp" id="rpp" placeholder="<? echo _('CPP'); ?>" title="<? echo _('Cuentas por página'); ?>"/>
+                
+                
             </td>
         </tr>
     </table>
 </form>
 <script>
     accSearch(0);
+    //$("#selCategory").combobox({dosearch: 1, placeholder: "<? //echo _('Seleccionar Categoría'); ?>"});
+    //$("#selCustomer").combobox({dosearch: 1, placeholder: "<? //echo _('Seleccionar Cliente'); ?>"});
     $("#selCustomer").chosen({
         allow_single_deselect: true,
         placeholder_text_single: "<? echo _('Seleccionar Cliente'); ?>", 
diff --git a/inc/users.class.php b/inc/users.class.php
index 2ab02ad1..7c5856c0 100644
--- a/inc/users.class.php
+++ b/inc/users.class.php
@@ -256,7 +256,7 @@ class SP_Users {
             $action_check = array();
 
             $lnkEdit = '<img src="imgs/edit.png" title="' . _('Editar') . '" class="inputImg" Onclick="return usrgrpDetail(' . $intId . ',' . $arrUsersTableProp["actionId"] . ',\'' . $sk . '\', ' . $arrUsersTableProp["active"] . ');" />';
-            $lnkDel = '<img src="imgs/delete.png" title="' . _('Eliminar') . '" class="inputImg" Onclick="return usersMgmt(' . $arrUsersTableProp["active"] . ', 1,' . $intId . ',' . $arrUsersTableProp["actionId"] . ',\'' . $sk . '\', ' . $arrUsersTableProp["active"] . ');" />';
+            $lnkDel = '<img src="imgs/delete.png" title="' . _('Eliminar') . '" class="inputImg" Onclick="return usersMgmt(\'\', 1,' . $intId . ',' . $arrUsersTableProp["actionId"] . ',\'' . $sk . '\', ' . $arrUsersTableProp["active"] . ');" />';
             $lnkPass = '<img src="imgs/key.png" title="' . _('Cambiar clave') . '" class="inputImg" Onclick="return usrUpdPass(' . $intId . ');" />';
 
             echo '<ul>';
@@ -523,7 +523,7 @@ class SP_Users {
         }
 
         // Número de cuentas con el grupo como primario
-        $query = "SELECT account_id FROM accounts WHERE account_userGroupId = " . (int) $this->groupId;
+        $query = "SELECT account_id FROM accounts WHERE account_groupId = " . (int) $this->groupId;
 
         if (DB::doQuery($query, __FUNCTION__) === FALSE) {
             return FALSE;
@@ -1110,14 +1110,14 @@ class SP_Users {
             return FALSE;
         }
 
-        $configMPass = SP_Config::getConfigValue('masterPwd');
+        $configMPass = SP_Config::getConfigParameter("masterPwd");
 
         if ($configMPass === FALSE) {
             return FALSE;
         }
 
         // Comprobamos el hash de la clave del usuario con la guardada
-        return SP_Crypt::checkHashPass($userMPass, $configMPass);
+        return SP_Crypt::checkHashPass($userMPass, $configMPass[0]->config_value);
     }
 
     /**
@@ -1137,7 +1137,7 @@ class SP_Users {
             return FALSE;
         }
 
-        $configMPassTime = SP_Config::getConfigValue('lastupdatempass');
+        $configMPassTime = SP_Config::getConfigParameter("lastupdatempass");
 
         if ($configMPassTime === FALSE) {
             return FALSE;
@@ -1154,7 +1154,7 @@ class SP_Users {
             $userLastUpdateMPass = $userData->user_lastUpdateMPass;
         }
 
-        if ($configMPassTime > $userLastUpdateMPass) {
+        if ($configMPassTime[0]->config_value > $userLastUpdateMPass) {
             return FALSE;
         }
 
@@ -1166,13 +1166,13 @@ class SP_Users {
      * @return bool
      */
     public function updateUserMPass($masterPwd) {
-        $configMPass = SP_Config::getConfigValue('masterPwd');
+        $configMPass = SP_Config::getConfigParameter("masterPwd");
 
         if (!$configMPass) {
             return FALSE;
         }
 
-        if (SP_Crypt::checkHashPass($masterPwd, $configMPass)) {
+        if (SP_Crypt::checkHashPass($masterPwd, $configMPass[0]->config_value)) {
             $crypt = new SP_Crypt;
             $strUserMPwd = $crypt->mkCustomMPassEncrypt($this->getCypherPass(), $masterPwd);
 
@@ -1201,7 +1201,7 @@ class SP_Users {
      * @return string con la clave de cifrado
      */
     private function getCypherPass(){
-        $configSalt = SP_Config::getConfigValue('passwordsalt');
+        $configSalt = SP_Config::getConfigParameter("passwordsalt");
         $cypherPass = substr(sha1($configSalt.$this->userPass), 0, 32);
         
         return $cypherPass;
diff --git a/inc/util.class.php b/inc/util.class.php
index ec86fcf8..17345068 100644
--- a/inc/util.class.php
+++ b/inc/util.class.php
@@ -169,7 +169,7 @@ class SP_Util {
      * @return array con el número de versión
      */
     public static function getVersion() {
-        return array(1, 00, 'rc3');
+        return array(1, 00, 'rc2');
     }
     
     /**
@@ -177,7 +177,7 @@ class SP_Util {
      * @return string con la versión
      */
     public static function getVersionString() {
-        return '1.0rc3';
+        return '1.0rc2';
     }
     
     /**
diff --git a/js/alertify.min.js b/js/alertify.min.js
deleted file mode 100644
index c4b6cc81..00000000
--- a/js/alertify.min.js
+++ /dev/null
@@ -1,2 +0,0 @@
-/*! alertify - v0.3.11 - 2013-10-08 */
-!function(a,b){"use strict";var c,d=a.document;c=function(){var c,e,f,g,h,i,j,k,l,m,n,o,p,q={},r={},s=!1,t={ENTER:13,ESC:27,SPACE:32},u=[];return r={buttons:{holder:'<nav class="alertify-buttons">{{buttons}}</nav>',submit:'<button type="submit" class="alertify-button alertify-button-ok" id="alertify-ok">{{ok}}</button>',ok:'<button class="alertify-button alertify-button-ok" id="alertify-ok">{{ok}}</button>',cancel:'<button class="alertify-button alertify-button-cancel" id="alertify-cancel">{{cancel}}</button>'},input:'<div class="alertify-text-wrapper"><input type="text" class="alertify-text" id="alertify-text"></div>',message:'<p class="alertify-message">{{message}}</p>',log:'<article class="alertify-log{{class}}">{{message}}</article>'},p=function(){var a,c,e=!1,f=d.createElement("fakeelement"),g={WebkitTransition:"webkitTransitionEnd",MozTransition:"transitionend",OTransition:"otransitionend",transition:"transitionend"};for(a in g)if(f.style[a]!==b){c=g[a],e=!0;break}return{type:c,supported:e}},c=function(a){return d.getElementById(a)},q={labels:{ok:"OK",cancel:"Cancel"},delay:5e3,buttonReverse:!1,buttonFocus:"ok",transition:b,addListeners:function(a){var b,c,i,j,k,l="undefined"!=typeof f,m="undefined"!=typeof e,n="undefined"!=typeof o,p="",q=this;b=function(b){return"undefined"!=typeof b.preventDefault&&b.preventDefault(),i(b),"undefined"!=typeof o&&(p=o.value),"function"==typeof a&&("undefined"!=typeof o?a(!0,p):a(!0)),!1},c=function(b){return"undefined"!=typeof b.preventDefault&&b.preventDefault(),i(b),"function"==typeof a&&a(!1),!1},i=function(){q.hide(),q.unbind(d.body,"keyup",j),q.unbind(g,"focus",k),l&&q.unbind(f,"click",b),m&&q.unbind(e,"click",c)},j=function(a){var d=a.keyCode;(d===t.SPACE&&!n||n&&d===t.ENTER)&&b(a),d===t.ESC&&m&&c(a)},k=function(){n?o.focus():!m||q.buttonReverse?f.focus():e.focus()},this.bind(g,"focus",k),this.bind(h,"focus",k),l&&this.bind(f,"click",b),m&&this.bind(e,"click",c),this.bind(d.body,"keyup",j),this.transition.supported||this.setFocus()},bind:function(a,b,c){"function"==typeof a.addEventListener?a.addEventListener(b,c,!1):a.attachEvent&&a.attachEvent("on"+b,c)},handleErrors:function(){if("undefined"!=typeof a.onerror){var b=this;return a.onerror=function(a,c,d){b.error("["+a+" on line "+d+" of "+c+"]",0)},!0}return!1},appendButtons:function(a,b){return this.buttonReverse?b+a:a+b},build:function(a){var b="",c=a.type,d=a.message,e=a.cssClass||"";switch(b+='<div class="alertify-dialog">',b+='<a id="alertify-resetFocusBack" class="alertify-resetFocus" href="#">Reset Focus</a>',"none"===q.buttonFocus&&(b+='<a href="#" id="alertify-noneFocus" class="alertify-hidden"></a>'),"prompt"===c&&(b+='<div id="alertify-form">'),b+='<article class="alertify-inner">',b+=r.message.replace("{{message}}",d),"prompt"===c&&(b+=r.input),b+=r.buttons.holder,b+="</article>","prompt"===c&&(b+="</div>"),b+='<a id="alertify-resetFocus" class="alertify-resetFocus" href="#">Reset Focus</a>',b+="</div>",c){case"confirm":b=b.replace("{{buttons}}",this.appendButtons(r.buttons.cancel,r.buttons.ok)),b=b.replace("{{ok}}",this.labels.ok).replace("{{cancel}}",this.labels.cancel);break;case"prompt":b=b.replace("{{buttons}}",this.appendButtons(r.buttons.cancel,r.buttons.submit)),b=b.replace("{{ok}}",this.labels.ok).replace("{{cancel}}",this.labels.cancel);break;case"alert":b=b.replace("{{buttons}}",r.buttons.ok),b=b.replace("{{ok}}",this.labels.ok)}return l.className="alertify alertify-"+c+" "+e,k.className="alertify-cover",b},close:function(a,b){var c,d,e=b&&!isNaN(b)?+b:this.delay,f=this;this.bind(a,"click",function(){c(a)}),d=function(a){a.stopPropagation(),f.unbind(this,f.transition.type,d),m.removeChild(this),m.hasChildNodes()||(m.className+=" alertify-logs-hidden")},c=function(a){"undefined"!=typeof a&&a.parentNode===m&&(f.transition.supported?(f.bind(a,f.transition.type,d),a.className+=" alertify-log-hide"):(m.removeChild(a),m.hasChildNodes()||(m.className+=" alertify-logs-hidden")))},0!==b&&setTimeout(function(){c(a)},e)},dialog:function(a,b,c,e,f){j=d.activeElement;var g=function(){m&&null!==m.scrollTop&&k&&null!==k.scrollTop||g()};if("string"!=typeof a)throw new Error("message must be a string");if("string"!=typeof b)throw new Error("type must be a string");if("undefined"!=typeof c&&"function"!=typeof c)throw new Error("fn must be a function");return this.init(),g(),u.push({type:b,message:a,callback:c,placeholder:e,cssClass:f}),s||this.setup(),this},extend:function(a){if("string"!=typeof a)throw new Error("extend method must have exactly one paramter");return function(b,c){return this.log(b,a,c),this}},hide:function(){var a,b=this;u.splice(0,1),u.length>0?this.setup(!0):(s=!1,a=function(c){c.stopPropagation(),b.unbind(l,b.transition.type,a)},this.transition.supported?(this.bind(l,this.transition.type,a),l.className="alertify alertify-hide alertify-hidden"):l.className="alertify alertify-hide alertify-hidden alertify-isHidden",k.className="alertify-cover alertify-cover-hidden",j.focus())},init:function(){d.createElement("nav"),d.createElement("article"),d.createElement("section"),null==c("alertify-cover")&&(k=d.createElement("div"),k.setAttribute("id","alertify-cover"),k.className="alertify-cover alertify-cover-hidden",d.body.appendChild(k)),null==c("alertify")&&(s=!1,u=[],l=d.createElement("section"),l.setAttribute("id","alertify"),l.className="alertify alertify-hidden",d.body.appendChild(l)),null==c("alertify-logs")&&(m=d.createElement("section"),m.setAttribute("id","alertify-logs"),m.className="alertify-logs alertify-logs-hidden",d.body.appendChild(m)),d.body.setAttribute("tabindex","0"),this.transition=p()},log:function(a,b,c){var d=function(){m&&null!==m.scrollTop||d()};return this.init(),d(),m.className="alertify-logs",this.notify(a,b,c),this},notify:function(a,b,c){var e=d.createElement("article");e.className="alertify-log"+("string"==typeof b&&""!==b?" alertify-log-"+b:""),e.innerHTML=a,m.appendChild(e),setTimeout(function(){e.className=e.className+" alertify-log-show"},50),this.close(e,c)},set:function(a){var b;if("object"!=typeof a&&a instanceof Array)throw new Error("args must be an object");for(b in a)a.hasOwnProperty(b)&&(this[b]=a[b])},setFocus:function(){o?(o.focus(),o.select()):i.focus()},setup:function(a){var d,j=u[0],k=this;s=!0,d=function(a){a.stopPropagation(),k.setFocus(),k.unbind(l,k.transition.type,d)},this.transition.supported&&!a&&this.bind(l,this.transition.type,d),l.innerHTML=this.build(j),g=c("alertify-resetFocus"),h=c("alertify-resetFocusBack"),f=c("alertify-ok")||b,e=c("alertify-cancel")||b,i="cancel"===q.buttonFocus?e:"none"===q.buttonFocus?c("alertify-noneFocus"):f,o=c("alertify-text")||b,n=c("alertify-form")||b,"string"==typeof j.placeholder&&""!==j.placeholder&&(o.value=j.placeholder),a&&this.setFocus(),this.addListeners(j.callback)},unbind:function(a,b,c){"function"==typeof a.removeEventListener?a.removeEventListener(b,c,!1):a.detachEvent&&a.detachEvent("on"+b,c)}},{alert:function(a,b,c){return q.dialog(a,"alert",b,"",c),this},confirm:function(a,b,c){return q.dialog(a,"confirm",b,"",c),this},extend:q.extend,init:q.init,log:function(a,b,c){return q.log(a,b,c),this},prompt:function(a,b,c,d){return q.dialog(a,"prompt",b,c,d),this},success:function(a,b){return q.log(a,"success",b),this},error:function(a,b){return q.log(a,"error",b),this},set:function(a){q.set(a)},labels:q.labels,debug:q.handleErrors}},"function"==typeof define?define([],function(){return new c}):"undefined"==typeof a.alertify&&(a.alertify=new c)}(this);
\ No newline at end of file
diff --git a/js/functions.js b/js/functions.js
index b71a6ec1..ad4755e3 100644
--- a/js/functions.js
+++ b/js/functions.js
@@ -300,7 +300,7 @@ function saveAccount(frm) {
             var status = parseInt($(xml).find("status").text());
             var description = $(xml).find("description").text();
                         
-            if ( status === 0 ){                
+            if ( status === 0 ){              
                 resMsg("ok", description);
                 
                 if ( savetyp == 1 ){
@@ -330,36 +330,38 @@ function saveAccount(frm) {
 // Función para eliminar una cuenta
 function delAccount(id,action,sk){
     var data = {accountid: id, savetyp: action, sk: sk};
-    var atext = '<div id="alert"><p id="alert-text">' + LANG[8] + '</p></div>';
-    
-    alertify.confirm(atext, function (e) {
-        if (e) {
-            $.fancybox.showLoading();
-            $.ajax({
-                type: 'POST',
-                dataType: 'xml',
-                url: APP_ROOT + '/ajax/ajax_accountsave.php',
-                data: data,
-                success: function(xml){
-                    var status = parseInt($(xml).find("status").text());
-                    var description = $(xml).find("description").text();
 
-                    if ( status === 0 ){
-                        resMsg("ok", description);
-                        doAction('accsearch');
-                    } else if ( status === 10){
-                        resMsg("error", description);
-                        doLogout();
-                    } else {
-                        resMsg("error", description);
-                    }
-                },
-                error: function(jqXHR, textStatus, errorThrown){ 
-                    resMsg("error", 'Oops...' + LANG[0]);
-                },
-                complete: function(){$.fancybox.hideLoading();}
-            });
-        }
+    $.fancybox.showLoading();
+    
+    var res = confirm (LANG[8]);
+    if ( ! res ){
+        $.fancybox.hideLoading();
+        return false;
+    }    
+
+    $.ajax({
+        type: 'POST',
+        dataType: 'xml',
+        url: APP_ROOT + '/ajax/ajax_accountsave.php',
+        data: data,
+        success: function(xml){
+            var status = parseInt($(xml).find("status").text());
+            var description = $(xml).find("description").text();
+
+            if ( status === 0 ){
+                resMsg("ok", description);
+                doAction('accsearch');
+            } else if ( status === 10){
+                resMsg("error", description);
+                doLogout();
+            } else {
+                resMsg("error", description);
+            }
+        },
+        error: function(jqXHR, textStatus, errorThrown){ 
+            resMsg("error", 'Oops...' + LANG[0]);
+        },
+        complete: function(){$.fancybox.hideLoading();}
     });
 }
 
@@ -471,16 +473,16 @@ function downFile(fancy){
 function getFiles(id, isDel, sk){
     var data = {'id' : id, 'del' : isDel, 'sk' : sk};
 		
-    $.ajax({
-        type : "GET",
-        cache : false,
-        url : APP_ROOT + "/ajax/ajax_getFiles.php",
-        data : data,
-        success: function(response) {
-                            $('#downFiles').html(response);
-        },
-        complete: function(){$.fancybox.hideLoading();}
-    });
+	$.ajax({
+            type : "GET",
+            cache : false,
+            url : APP_ROOT + "/ajax/ajax_getFiles.php",
+            data : data,
+            success: function(response) {
+				$('#downFiles').html(response);
+            },
+            complete: function(){$.fancybox.hideLoading();}
+	});
 }
 
 // Función para eliminar archivos de una cuenta
@@ -531,6 +533,7 @@ function upldFile(id){
 
 // Función para mostrar los registros de usuarios y grupos
 function usrgrpDetail(id, type, sk, active){
+    //var active = parseInt($('input:[name=active]').val());
     var data = {'id' : id, 'type' : type, 'sk' : sk, 'active' : active};
     var url = APP_ROOT + '/ajax/ajax_usersMgmt.php';
 
@@ -545,7 +548,7 @@ function usrgrpDetail(id, type, sk, active){
             $.fancybox(response,{
                 padding: [0,10,10,10],
                 afterClose: function(){doAction('usersmenu','',active);}
-            });
+                });
         },
         error:function(jqXHR, textStatus, errorThrown){
             var txt = LANG[1] + '<p>' + errorThrown + textStatus + '</p>';
@@ -558,71 +561,61 @@ function usrgrpDetail(id, type, sk, active){
 // Función para editar los registros de usuarios y grupos
 function usersMgmt(frmId, isDel, id, type, sk){
     var data;
+    var active = parseInt($('input:[name=active]').val());
     var url = '/ajax/ajax_usersSave.php';
     
     if ( isDel === 1 ){
         var data = {'id' : id, 'type' : type, 'action' : 4, 'sk' : sk };
-        var atext = '<div id="alert"><p id="alert-text">' + LANG[21] + '</p></div>';
-        var active = frmId;
         
-        alertify.confirm(atext, function (e) {
-            if ( e) {
-                usersAjax(data, url);
-                doAction('usersmenu','',active)
-            }
-        });
+        var res = confirm (LANG[21]);
+        if ( ! res ){
+            return false;
+        }
     } else {
         data = $("#" + frmId).serialize();
-        //type = parseInt($('input:[name=type]').val());
-        
-        usersAjax(data, url);
-    } 
-}
+        type = parseInt($('input:[name=type]').val());
+    }
+    
+    $.fancybox.showLoading();
 
-// Función para realizar la petición ajax de gestión de usuarios
-function usersAjax(data, url){
-$.fancybox.showLoading();
+    $.ajax({
+        type: 'POST',
+        dataType: 'xml',
+        url: APP_ROOT + url,
+        data: data,
+        success: function(xml){
+            var status = parseInt($(xml).find("status").text());
+            var description = $(xml).find("description").text();
+            description = description.replace(/;;/g,"<br />");
 
-$.ajax({
-    type: 'POST',
-    dataType: 'xml',
-    url: APP_ROOT + url,
-    data: data,
-    success: function(xml){
-        var status = parseInt($(xml).find("status").text());
-        var description = $(xml).find("description").text();
-        description = description.replace(/;;/g,"<br />");
-
-        switch(status){
-            case 0:
-                $.fancybox.close();
-                resMsg("ok", description);
-                break;
-            case 1:
-                $.fancybox.close();
-                resMsg("error", description);
-                break;
-            case 2:
-                $("#resFancyAccion").html('<span class="altTxtError">' + description + '</span>');
-                $("#resFancyAccion").show();
-                break;
-            case 3:
-                $.fancybox.close();
-                resMsg("warn", description);
-                break;
-            case 10:
-                doLogout();
-                break;
-            default:
-                return;
-         }  
-    },
-    error:function(jqXHR, textStatus, errorThrown){
-        var txt = LANG[1] + '<p>' + errorThrown + textStatus + '</p>';
-        resMsg("error", txt);
-    },
-    complete: function(){$.fancybox.hideLoading();}
-});
+            switch(status){
+                case 0:
+//                    doAction('usersmenu','',active);
+                    resMsg("ok", description);
+                    break;
+                case 1:
+                    resMsg("error", description);
+                    break;
+                case 2:
+                    $("#resFancyAccion").html('<span class="altTxtError">' + description + '</span>');
+                    $("#resFancyAccion").show();
+                    break;
+                case 3:
+                    resMsg("warn", description);
+                    break;
+                case 10:
+                    doLogout();
+                    break;
+                default:
+                    return;
+             }  
+        },
+        error:function(jqXHR, textStatus, errorThrown){
+            var txt = LANG[1] + '<p>' + errorThrown + textStatus + '</p>';
+            resMsg("error", txt);
+        },
+        complete: function(){$.fancybox.hideLoading();}
+    });   
 }
 
 // Función para mostrar el formulario para cambio de clave de usuario
@@ -731,9 +724,10 @@ function password(length, special, fancy, dstId) {
     
     if ( fancy == true ){
         $("#viewPass").attr("title",password);
-        //alertify.alert('<div id="alert"><p id="alert-text">' + LANG[15] + '</p><p id="alert-pass"> ' + password + '</p>');
+//        var txt = '<span class="altTxtBlue">' + LANG[15] + "</span><br><br>" + password;
+//        resMsg("info", txt);
     } else {
-        alertify.alert('<div id="alert"><p id="alert-text">' + LANG[15] + '</p><p id="alert-pass"> ' + password + '</p>');
+        alert ( LANG[15] + " " + password);
     }
    
    if ( dstId ){
@@ -843,14 +837,14 @@ function resMsg(type, txt, url, action){
     
     switch(type){
         case "ok":
-            //html = '<div id="fancyMsg" class="msgOk">' + txt + '</div>';
-            return alertify.success(txt);
+            html = '<div id="fancyMsg" class="msgOk">' + txt + '</div>';
+            break;
         case "error":
-            //html = '<div id="fancyMsg" class="msgError">' + txt + '</div>';
-            return alertify.error(txt);
+            html = '<div id="fancyMsg" class="msgError">' + txt + '</div>';
+            break;
         case "warn":
-            //html = '<div id="fancyMsg" class="msgWarn">' + txt + '</div>';
-            return alertify.log(txt);
+            html = '<div id="fancyMsg" class="msgWarn">' + txt + '</div>';
+            break;
         case "info":
             html = '<div id="fancyMsg" class="msgInfo">' + txt + '</div>';
             break;
@@ -862,10 +856,9 @@ function resMsg(type, txt, url, action){
             return html;
             break;
         default:
-            //html = '<div id="fancyMsg" class="msgError">Oops...<br /' + LANG[1] + '</div>';
-            return alertify.error(txt);
+            html = '<div id="fancyMsg" class="msgError">Oops...<br /' + LANG[1] + '</div>';
     }
-        
+    
     $.fancybox(html,{afterLoad: function(){
         $('.fancybox-skin,.fancybox-outer,.fancybox-inner').css({'border-radius':'25px','-moz-border-radius':'25px','-webkit-border-radius':'25px'});
         },afterClose : function() { if ( typeof(action) !== "undefined" ) eval(action);} });
diff --git a/js/functions.php b/js/functions.php
index 354244d8..12ae82ce 100644
--- a/js/functions.php
+++ b/js/functions.php
@@ -73,7 +73,7 @@ $locale= array(
                     'Option not selected',
                     'Option added<BR \>You should save configuration in order to take effect',
                     'Option deleted<BR \>You should save configuration in order to take effect',
-                    'Generated Password',
+                    'Generated Password:',
                     'High level',
                     'Average level',
                     'Low level',