diff --git a/mojotrollz/api/realm/qq/ACCOUNT_CREATE.php b/mojotrollz/api/realm/qq/ACCOUNT_CREATE.php
index 67f28f3..d3f6edf 100644
--- a/mojotrollz/api/realm/qq/ACCOUNT_CREATE.php
+++ b/mojotrollz/api/realm/qq/ACCOUNT_CREATE.php
@@ -8,7 +8,7 @@ class ACCOUNT_CREATE extends \SYSTEM\DB\QP {
 '',
 //mys
 'INSERT INTO account (username, sha_pass_hash, email)
-VALUES(?,?,?);',
+VALUES(UPPER(?),?,?);',
 new \DBD\mangos_realm()
 );}}
 
diff --git a/mojotrollz/api/realm/qq/ACCOUNT_GET_ID.php b/mojotrollz/api/realm/qq/ACCOUNT_GET_ID.php
index 7e68bc2..26f1895 100644
--- a/mojotrollz/api/realm/qq/ACCOUNT_GET_ID.php
+++ b/mojotrollz/api/realm/qq/ACCOUNT_GET_ID.php
@@ -7,7 +7,7 @@ class ACCOUNT_GET_ID extends \SYSTEM\DB\QP {
 //pg            
 '',
 //mys
-'SELECT id FROM account WHERE username = ?;',
+'SELECT id FROM account WHERE username = UPPER(?);',
 new \DBD\mangos_realm()
 );}}
 
diff --git a/mojotrollz/page/wizard_register/js/wizard_register.js b/mojotrollz/page/wizard_register/js/wizard_register.js
index b7fcbb4..0e9cfab 100644
--- a/mojotrollz/page/wizard_register/js/wizard_register.js
+++ b/mojotrollz/page/wizard_register/js/wizard_register.js
@@ -14,7 +14,7 @@ function init_wizard_register(){
                 var password = document.getElementById('register_password1').value;
                 var locale = "enUS";
                 var betacode = document.getElementById('register_betacode').value;
-                var wow_password = "";
+                var wow_password = sha1(username.toUpperCase()+':'+password.toUpperCase());
                 $.ajax({type :  'GET',
                     url:    './api.php?call=account&action=create&username='+username+
                             '&password_sha='+$.sha1(password)+
diff --git a/mojotrollz/sai/autoload.inc b/mojotrollz/sai/autoload.inc
index a73bcdd..66bf458 100644
--- a/mojotrollz/sai/autoload.inc
+++ b/mojotrollz/sai/autoload.inc
@@ -6,7 +6,7 @@ require_once dirname(__FILE__).'/saimod_mojotrollz_db_creature/autoload.inc';
 require_once dirname(__FILE__).'/saimod_mojotrollz_db_item/autoload.inc';
 require_once dirname(__FILE__).'/saimod_mojotrollz_db_quest/autoload.inc';
 require_once dirname(__FILE__).'/saimod_mojotrollz_db_object/autoload.inc';
-require_once dirname(__FILE__).'/saimod_mojotrollz_db_player/autoload.inc';
+require_once dirname(__FILE__).'/saimod_mojotrollz_db_character/autoload.inc';
 SYSTEM\autoload::registerFolder(dirname(__FILE__).'/saimod_mojotrollz_db_spell','');
 \SYSTEM\SAI\sai::register('saimod_mojotrollz_db_spell');
 require_once dirname(__FILE__).'/saimod_mojotrollz_db_tags/autoload.inc';
diff --git a/mojotrollz/sai/saimod_mojotrollz_db_character/autoload.inc b/mojotrollz/sai/saimod_mojotrollz_db_character/autoload.inc
new file mode 100644
index 0000000..23ff917
--- /dev/null
+++ b/mojotrollz/sai/saimod_mojotrollz_db_character/autoload.inc
@@ -0,0 +1,3 @@
+<?php
+SYSTEM\autoload::registerFolder(dirname(__FILE__));
+\SYSTEM\SAI\sai::register('saimod_mojotrollz_db_character');
diff --git a/mojotrollz/sai/saimod_mojotrollz_db_character/js/saimod_mojotrollz_db_character.js b/mojotrollz/sai/saimod_mojotrollz_db_character/js/saimod_mojotrollz_db_character.js
new file mode 100644
index 0000000..7d7f53d
--- /dev/null
+++ b/mojotrollz/sai/saimod_mojotrollz_db_character/js/saimod_mojotrollz_db_character.js
@@ -0,0 +1,3 @@
+function init_saimod_mojotrollz_db_character(){
+    map(6,-1);
+}
\ No newline at end of file
diff --git a/mojotrollz/sai/saimod_mojotrollz_db_player/saimod_mojotrollz_db_player.php b/mojotrollz/sai/saimod_mojotrollz_db_character/saimod_mojotrollz_db_character.php
similarity index 56%
rename from mojotrollz/sai/saimod_mojotrollz_db_player/saimod_mojotrollz_db_player.php
rename to mojotrollz/sai/saimod_mojotrollz_db_character/saimod_mojotrollz_db_character.php
index 805ca71..cc923b6 100644
--- a/mojotrollz/sai/saimod_mojotrollz_db_player/saimod_mojotrollz_db_player.php
+++ b/mojotrollz/sai/saimod_mojotrollz_db_character/saimod_mojotrollz_db_character.php
@@ -1,26 +1,26 @@
 <?php
-class saimod_mojotrollz_db_player extends \SYSTEM\SAI\SaiModule {    
-    public static function sai_mod_saimod_mojotrollz_db_player(){
+class saimod_mojotrollz_db_character extends \SYSTEM\SAI\SaiModule {    
+    public static function sai_mod_saimod_mojotrollz_db_character(){
         $con = new \SYSTEM\DB\Connection(new \DBD\mangos_chars());
         $res = $con->query('SELECT * FROM characters WHERE deleteInfos_Account IS NULL LIMIT 100;');
         $vars = array();
         $elements =   '';
         while($row = $res->next()){
             $row['name'] = utf8_encode($row['name']);
-            $elements .= \SYSTEM\PAGE\replace::replaceFile(\SYSTEM\SERVERPATH(new PSAI(),'saimod_mojotrollz_db_player/tpl/player.tpl'), $row);}
+            $elements .= \SYSTEM\PAGE\replace::replaceFile(\SYSTEM\SERVERPATH(new PSAI(),'saimod_mojotrollz_db_character/tpl/character.tpl'), $row);}
         $vars['elements'] = $elements;
         $vars['map'] = map::generate(6);
-        return \SYSTEM\PAGE\replace::replaceFile(\SYSTEM\SERVERPATH(new PSAI(),'saimod_mojotrollz_db_player/tpl/players.tpl'), $vars);
+        return \SYSTEM\PAGE\replace::replaceFile(\SYSTEM\SERVERPATH(new PSAI(),'saimod_mojotrollz_db_character/tpl/characters.tpl'), $vars);
     }
-    public static function html_li_menu(){return '<li><a href="#" saimenu="saimod_mojotrollz_db_player">DB:Players</a></li><li class="divider"></li>';}
+    public static function html_li_menu(){return '<li><a href="#" saimenu="saimod_mojotrollz_db_character">DB:Characters</a></li><li class="divider"></li>';}
     public static function right_public(){return false;}    
     public static function right_right(){return \SYSTEM\SECURITY\Security::check(\SYSTEM\SECURITY\RIGHTS::SYS_SAI);}
-    public static function sai_mod_saimod_mojotrollz_db_player_flag_js(){return \SYSTEM\LOG\JsonResult::toString(array(
+    public static function sai_mod_saimod_mojotrollz_db_character_flag_js(){return \SYSTEM\LOG\JsonResult::toString(array(
             \SYSTEM\WEBPATH(new PAPI(),'database/js/wow.js'),
             \SYSTEM\WEBPATH(new PAPI(),'map/js/map.js'),
-            \SYSTEM\WEBPATH(new PSAI(),'saimod_mojotrollz_db_player/js/saimod_mojotrollz_db_player.js')
+            \SYSTEM\WEBPATH(new PSAI(),'saimod_mojotrollz_db_character/js/saimod_mojotrollz_db_character.js')
     ));}        
-    public static function sai_mod_saimod_mojotrollz_db_player_flag_css(){return \SYSTEM\LOG\JsonResult::toString(array(
+    public static function sai_mod_saimod_mojotrollz_db_character_flag_css(){return \SYSTEM\LOG\JsonResult::toString(array(
             \SYSTEM\WEBPATH(new PAPI(),'map/css/map.css')
     ));}
 
diff --git a/mojotrollz/sai/saimod_mojotrollz_db_player/tpl/player.tpl b/mojotrollz/sai/saimod_mojotrollz_db_character/tpl/character.tpl
similarity index 100%
rename from mojotrollz/sai/saimod_mojotrollz_db_player/tpl/player.tpl
rename to mojotrollz/sai/saimod_mojotrollz_db_character/tpl/character.tpl
diff --git a/mojotrollz/sai/saimod_mojotrollz_db_player/tpl/players.tpl b/mojotrollz/sai/saimod_mojotrollz_db_character/tpl/characters.tpl
similarity index 100%
rename from mojotrollz/sai/saimod_mojotrollz_db_player/tpl/players.tpl
rename to mojotrollz/sai/saimod_mojotrollz_db_character/tpl/characters.tpl
diff --git a/mojotrollz/sai/saimod_mojotrollz_db_creature/saimod_mojotrollz_db_creature.php b/mojotrollz/sai/saimod_mojotrollz_db_creature/saimod_mojotrollz_db_creature.php
index 75e516e..d173501 100644
--- a/mojotrollz/sai/saimod_mojotrollz_db_creature/saimod_mojotrollz_db_creature.php
+++ b/mojotrollz/sai/saimod_mojotrollz_db_creature/saimod_mojotrollz_db_creature.php
@@ -7,7 +7,8 @@ class saimod_mojotrollz_db_creature extends \SYSTEM\SAI\SaiModule {
         $tags = json_decode($tags,true);
         foreach ($tags as $type=>$value){
             if($value == -2){
-                tags::del(tags::TAG_TABLE_CREATURE, $id, $type);}
+                tags::del(tags::TAG_TABLE_CREATURE, $id, $type);
+                continue;}
             tags::set(tags::TAG_TABLE_CREATURE, $id, $type, $value);}
         return JsonResult::ok();
     }
diff --git a/mojotrollz/sai/saimod_mojotrollz_db_item/saimod_mojotrollz_db_item.php b/mojotrollz/sai/saimod_mojotrollz_db_item/saimod_mojotrollz_db_item.php
index 958f402..616f6c2 100644
--- a/mojotrollz/sai/saimod_mojotrollz_db_item/saimod_mojotrollz_db_item.php
+++ b/mojotrollz/sai/saimod_mojotrollz_db_item/saimod_mojotrollz_db_item.php
@@ -7,7 +7,8 @@ class saimod_mojotrollz_db_item extends \SYSTEM\SAI\SaiModule {
         $tags = json_decode($tags,true);
         foreach ($tags as $type=>$value){
             if($value == -2){
-                tags::del(tags::TAG_TABLE_ITEM, $id, $type);}
+                tags::del(tags::TAG_TABLE_ITEM, $id, $type);
+                continue;}
             tags::set(tags::TAG_TABLE_ITEM, $id, $type, $value);}
         return JsonResult::ok();
     }
diff --git a/mojotrollz/sai/saimod_mojotrollz_db_object/saimod_mojotrollz_db_object.php b/mojotrollz/sai/saimod_mojotrollz_db_object/saimod_mojotrollz_db_object.php
index 5d9b85f..3ea0b7a 100644
--- a/mojotrollz/sai/saimod_mojotrollz_db_object/saimod_mojotrollz_db_object.php
+++ b/mojotrollz/sai/saimod_mojotrollz_db_object/saimod_mojotrollz_db_object.php
@@ -7,7 +7,8 @@ class saimod_mojotrollz_db_object extends \SYSTEM\SAI\SaiModule {
         $tags = json_decode($tags,true);
         foreach ($tags as $type=>$value){
             if($value == -2){
-                tags::del(tags::TAG_TABLE_OBJECT, $id, $type);}
+                tags::del(tags::TAG_TABLE_OBJECT, $id, $type);
+                continue;}
             tags::set(tags::TAG_TABLE_OBJECT, $id, $type, $value);}
         return JsonResult::ok();
     }
diff --git a/mojotrollz/sai/saimod_mojotrollz_db_player/autoload.inc b/mojotrollz/sai/saimod_mojotrollz_db_player/autoload.inc
deleted file mode 100644
index b99f8fe..0000000
--- a/mojotrollz/sai/saimod_mojotrollz_db_player/autoload.inc
+++ /dev/null
@@ -1,3 +0,0 @@
-<?php
-SYSTEM\autoload::registerFolder(dirname(__FILE__));
-\SYSTEM\SAI\sai::register('saimod_mojotrollz_db_player');
diff --git a/mojotrollz/sai/saimod_mojotrollz_db_player/js/saimod_mojotrollz_db_player.js b/mojotrollz/sai/saimod_mojotrollz_db_player/js/saimod_mojotrollz_db_player.js
deleted file mode 100644
index 7497868..0000000
--- a/mojotrollz/sai/saimod_mojotrollz_db_player/js/saimod_mojotrollz_db_player.js
+++ /dev/null
@@ -1,3 +0,0 @@
-function init_saimod_mojotrollz_db_player(){
-    map(6,-1);
-}
\ No newline at end of file
diff --git a/mojotrollz/sai/saimod_mojotrollz_db_quest/saimod_mojotrollz_db_quest.php b/mojotrollz/sai/saimod_mojotrollz_db_quest/saimod_mojotrollz_db_quest.php
index 2abf536..d1e0bc8 100644
--- a/mojotrollz/sai/saimod_mojotrollz_db_quest/saimod_mojotrollz_db_quest.php
+++ b/mojotrollz/sai/saimod_mojotrollz_db_quest/saimod_mojotrollz_db_quest.php
@@ -7,7 +7,8 @@ class saimod_mojotrollz_db_quest extends \SYSTEM\SAI\SaiModule {
         $tags = json_decode($tags,true);
         foreach ($tags as $type=>$value){
             if($value == -2){
-                tags::del(tags::TAG_TABLE_QUEST, $id, $type);}
+                tags::del(tags::TAG_TABLE_QUEST, $id, $type);
+                continue;}
             tags::set(tags::TAG_TABLE_QUEST, $id, $type, $value);}
         return JsonResult::ok();
     }