diff --git a/resources/views/auth/login.blade.php b/resources/views/auth/login.blade.php
index 9f9371b..0426acc 100755
--- a/resources/views/auth/login.blade.php
+++ b/resources/views/auth/login.blade.php
@@ -98,7 +98,9 @@
             </div>
 
             <div class="flex items-center justify-end mt-4">
+                @if($page->register == 'true' or env('REGISTER_OVERRIDE') === true)
                 <a class="underline text-sm text-gray-600 hover:text-gray-900" href="{{ route('register') }}">Register</a>&emsp;
+                @endif
                 @if (Route::has('password.request'))
                 <a class="underline text-sm text-gray-600 hover:text-gray-900" href="{{ route('password.request') }}">
                     {{ __('Forgot your password?') }}
diff --git a/resources/views/auth/register.blade.php b/resources/views/auth/register.blade.php
index 759299c..431ae27 100755
--- a/resources/views/auth/register.blade.php
+++ b/resources/views/auth/register.blade.php
@@ -113,6 +113,8 @@ foreach($pages as $page)
                 </x-button>
             </div>
         </form>
-		  @endif
+        @else
+        <br><br><center><h3>Registration is disabled by the administrator</h3></center><br>
+        @endif
     </x-auth-card>
 </x-guest-layout>