diff --git a/modules/setup/library/Setup/Steps/AuthenticationStep.php b/modules/setup/library/Setup/Steps/AuthenticationStep.php
index decf3b454..7c98bbbc7 100644
--- a/modules/setup/library/Setup/Steps/AuthenticationStep.php
+++ b/modules/setup/library/Setup/Steps/AuthenticationStep.php
@@ -104,13 +104,13 @@ class AuthenticationStep extends Step
                     'password'  => $this->data['adminAccountData']['password'],
                     'is_active' => true
                 ));
+                $this->dbError = false;
             }
         } catch (Exception $e) {
             $this->dbError = $e;
             return false;
         }
 
-        $this->dbError = false;
         return true;
     }