diff --git a/Changelog b/Changelog
index 8191297d1..4916c0045 100755
--- a/Changelog
+++ b/Changelog
@@ -1,4 +1,5 @@
 2018-09-25 DariusIII
+	* Fix: Fix login and user controllers behaviour if firewall is disabled
 	* Fix: Fix wrong assingment of role in users table on user creation
 	* Chg: Remove verified and verification_token from users table, it will be added by verification migration
 	* Chg: Publish the user verification migration to prevent database user table error
diff --git a/app/Http/Controllers/Admin/UserController.php b/app/Http/Controllers/Admin/UserController.php
index 0b4980774..c0252e837 100644
--- a/app/Http/Controllers/Admin/UserController.php
+++ b/app/Http/Controllers/Admin/UserController.php
@@ -152,7 +152,7 @@ class UserController extends BasePageController
                         $roleName = Role::query()->where('id', $request->input('role'))->value('name');
                         if ($roleName === 'Disabled') {
                             $blockedUser = User::find($request->input('id'));
-                            if (\Firewall::isBlacklisted($blockedUser->host) === false) {
+                            if (env('FIREWALL_ENABLED') === true && \Firewall::isBlacklisted($blockedUser->host) === false) {
                                 \Firewall::blacklist($blockedUser->host);
                             }
                         }
diff --git a/app/Http/Controllers/Auth/LoginController.php b/app/Http/Controllers/Auth/LoginController.php
index 87a887a9b..836041cb1 100644
--- a/app/Http/Controllers/Auth/LoginController.php
+++ b/app/Http/Controllers/Auth/LoginController.php
@@ -63,7 +63,7 @@ class LoginController extends Controller
             $user = User::getByEmail($request->input('username'));
         }
 
-        if ($user !== null && \Firewall::isBlacklisted($user->host) === false) {
+        if ($user !== null && ((env('FIREWALL_ENABLED') === true && \Firewall::isBlacklisted($user->host) === false) || env('FIREWALL_ENABLED') === false)) {
             if (env('NOCAPTCHA_ENABLED') === true && (! empty(env('NOCAPTCHA_SECRET')) && ! empty(env('NOCAPTCHA_SITEKEY')))) {
                 $this->validate($request, [
                     'g-recaptcha-response' => 'required|captcha',