diff --git a/core/lib/Thelia/Model/Lang.php b/core/lib/Thelia/Model/Lang.php
index 189b640ab..5f7289792 100755
--- a/core/lib/Thelia/Model/Lang.php
+++ b/core/lib/Thelia/Model/Lang.php
@@ -8,7 +8,7 @@ use Propel\Runtime\Propel;
 use Thelia\Core\Event\Lang\LangEvent;
 use Thelia\Core\Event\TheliaEvents;
 use Thelia\Model\Base\Lang as BaseLang;
-use Thelia\Model\Base\LangQuery;
+use Thelia\Model\LangQuery;
 use Thelia\Model\Map\LangTableMap;
 
 class Lang extends BaseLang {
diff --git a/reset_install.bat b/reset_install.bat
index f8c0b35e2..dc6d667e2 100644
--- a/reset_install.bat
+++ b/reset_install.bat
@@ -5,13 +5,20 @@ REM v0.1
 echo [WARN] This script will reset this Thelia2 install
 
 if exist local\config\database.yml (
+
+    echo [INFO] Clearing caches
+    php Thelia cache:clear
+
+    echo [INFO] Self-updating Composer
+    composer self-update
+
     echo [INFO] Downloading vendors
-    composer install --prefer-dist
+    composer install --prefer-dist --optimize-autoloader
 
     cd local\config\
 
     echo [INFO] Building Models file
-    ..\..\bin\propel build -v --output-dir=../../core/lib/
+    ..\..\bin\propel build -v --output-dir=../../core/lib/ --enable-identifier-quoting
 
     echo [INFO] Building SQL CREATE file
     ..\..\bin\propel sql:build -v --output-dir=..\..\install
@@ -25,8 +32,19 @@ if exist local\config\database.yml (
     echo [INFO] Installing fixtures
     php install\faker.php
 
+    echo [INFO] Clearing caches
+    php Thelia cache:clear
+
     echo [INFO] Adding admin
-    php Thelia admin:create
+    php Thelia admin:create --login_name thelia2 --password thelia2 --last_name thelia2 --first_name thelia2
+
+    echo [INFO] Admin user thelia2 with password thelia2 successfully created.
+
+    echo [INFO] Activating Delivery Module(s)
+    php Thelia module:activate Colissimo
+
+    echo "[INFO] Activating Payment Module(s)"
+    php Thelia module:activate Cheque
 
     echo [SUCCESS] Reset done
 )