diff --git a/flexiapi/app/Http/Controllers/Account/AuthenticateController.php b/flexiapi/app/Http/Controllers/Account/AuthenticateController.php
index 171cb1b..1ee0600 100644
--- a/flexiapi/app/Http/Controllers/Account/AuthenticateController.php
+++ b/flexiapi/app/Http/Controllers/Account/AuthenticateController.php
@@ -35,7 +35,7 @@ use App\Mail\PasswordAuthentication;
 
 class AuthenticateController extends Controller
 {
-    private $emailCodeSize = 12;
+    private $emailCodeSize = 13;
 
     public function login(Request $request)
     {
@@ -107,6 +107,13 @@ class AuthenticateController extends Controller
 
         $account = Account::where('confirmation_key', $code)->firstOrFail();
         $account->confirmation_key = null;
+
+        // If there is already a password set, we directly activate the account
+        if ($account->passwords()->count() != 0) {
+            $account->activated = true;
+            $account->save();
+        }
+
         $account->save();
 
         Auth::login($account);
diff --git a/flexiapi/app/Http/Controllers/Account/RegisterController.php b/flexiapi/app/Http/Controllers/Account/RegisterController.php
index 9824987..72b1cae 100644
--- a/flexiapi/app/Http/Controllers/Account/RegisterController.php
+++ b/flexiapi/app/Http/Controllers/Account/RegisterController.php
@@ -37,7 +37,7 @@ use App\Mail\NewsletterRegistration;
 
 class RegisterController extends Controller
 {
-    private $emailCodeSize = 12;
+    private $emailCodeSize = 13;
 
     public function register(Request $request)
     {
diff --git a/flexisip-account-manager.spec b/flexisip-account-manager.spec
index 444383e..2e6bce4 100644
--- a/flexisip-account-manager.spec
+++ b/flexisip-account-manager.spec
@@ -8,7 +8,7 @@
 #%define _datadir           %{_datarootdir}
 #%define _docdir            %{_datadir}/doc
 
-%define build_number 30
+%define build_number 31
 %define var_dir /var/opt/belledonne-communications
 %define opt_dir /opt/belledonne-communications/share/flexisip-account-manager
 %define env_file "$RPM_BUILD_ROOT/etc/flexisip-account-manager/flexiapi.env"