diff --git a/www/web/warpauth/views/register.py b/www/web/warpauth/views/register.py
index 099f678fe0d68d6d60957a9bf556c4e608cd468d..55337917eb3afd54b33ab788101d85163420e069 100644
--- a/www/web/warpauth/views/register.py
+++ b/www/web/warpauth/views/register.py
@@ -10,7 +10,7 @@ from warpauth.models import LdapUser, ActivationToken, LdapGroup
 from warpauth.util import *
 from django.utils.translation import ugettext as _
 from django.core.exceptions import ObjectDoesNotExist
-
+from warpzone.settings import INSTANCE_NAME
 
 def send_token(token):
     email_content = _("https://infra.warpzone.ms/account/registration/activate/%(token)s") % {'token': token.token }
@@ -20,6 +20,8 @@ def send_token(token):
 
 def register(request):
     page_context['success'] = False
+    if "INTERN" in INSTANCE_NAME:
+        return redirect('http://infra.warpzone.ms/registration/')
 
     if request.method == "POST":
         username = request.POST['username']
diff --git a/www/web/warpauth/views/reset_password.py b/www/web/warpauth/views/reset_password.py
index 15b6d799e7aef2ca91aa62320b6efc72e7ad443b..15741aed9e33c6687df4a42578232c7dda595da3 100644
--- a/www/web/warpauth/views/reset_password.py
+++ b/www/web/warpauth/views/reset_password.py
@@ -14,13 +14,16 @@ from warpzone.util import send_email
 from warpauth.util import *
 from warpauth.models import PasswordResetToken, LdapUser
 
-from warpzone.settings import PW_RESET_TOKEN_LIFETIME
+from warpzone.settings import PW_RESET_TOKEN_LIFETIME, INSTANCE_NAME
 
 #
 # Function to generate a password reset Token
 #
 
 def gen_token(request):
+    if "INTERN" in INSTANCE_NAME:
+        return redirect('http://infra.warpzone.ms/reset_password/')
+
     if request.POST:
         try:
             usr = LdapUser.objects.get(uid=request.POST["username"])
@@ -45,6 +48,8 @@ def gen_token(request):
 #
 
 def change_password(request, reset_hash=None):
+    if "INTERN" in INSTANCE_NAME:
+        return redirect('http://infra.warpzone.ms/reset_password/')
     try:
         pw_reset_token = PasswordResetToken.objects.get(hash=reset_hash)
         time_difference = datetime.datetime.now() - pw_reset_token.created
diff --git a/www/web/warpzone/settings.py b/www/web/warpzone/settings.py
index b0f7bb2619149f419d8981f987878bae98e620a7..d9e6d65eaec37b4399373c08293a0cca6d2cacee 100644
--- a/www/web/warpzone/settings.py
+++ b/www/web/warpzone/settings.py
@@ -52,10 +52,11 @@ SECRET_KEY = config.get('security','SECRET_KEY')
 API_KEY = config.get('mattermost','API_KEY')
 
 # DEBUG
-DEBUG = config.getboolean('debug','DEBUG')
+DEBUG = config.getboolean('debug', 'DEBUG')
 
 # MISC
-LOG_PATH = config.get('misc','LOG_PATH')
+LOG_PATH = config.get('misc', 'LOG_PATH')
+INSTANCE_NAME = config.get('common', 'INSTANCE_NAME')
 
 ALLOWED_HOSTS = [config.get('security','ALLOWED_HOSTS')]