diff --git a/castle/cms/authentication.py b/castle/cms/authentication.py
index 685ed8a9e..e4c8e865d 100644
--- a/castle/cms/authentication.py
+++ b/castle/cms/authentication.py
@@ -100,7 +100,8 @@ def request_form_url(self):
         url = '/@@request-form'
         if not self.is_zope_root and self.registry:
             url = self.registry.get('plone.request_access_form_path', '/@@request-form')
-        return url
+        base_url = api.portal.get().absolute_url()
+        return ''.join([base_url, url])
 
     @property
     def expire(self):
diff --git a/castle/cms/browser/security/requestaccess.py b/castle/cms/browser/security/requestaccess.py
index 07c6463b4..fe1888a31 100644
--- a/castle/cms/browser/security/requestaccess.py
+++ b/castle/cms/browser/security/requestaccess.py
@@ -44,6 +44,8 @@ def request_access_email_addresses(self):
             'plone.request_access_form_email_addresses',
             default=system_email_address,
         )
+        if not access_request_email_addresses:
+            return []
         return list(set([
             email.strip()
             for email in access_request_email_addresses.splitlines()
diff --git a/castle/cms/browser/security/templates/request-form.pt b/castle/cms/browser/security/templates/request-form.pt
index f3a3690ac..f90147c45 100644
--- a/castle/cms/browser/security/templates/request-form.pt
+++ b/castle/cms/browser/security/templates/request-form.pt
@@ -42,20 +42,11 @@
           <div class="row justify-content-center">
             <div class="col-md-4"></div>
             <div class="col-md-4">
-              <div class="form-group">
-                  <label for="name">Name</label>
+              <div tal:repeat="field view/accepted_fields"
+                   class="form-group">
+                  <label for="${field}">${python: field.title()}</label>
                   <br />
-                  <input type='text' id='name' name='name' style='width: 100%' required>
-              </div>
-              <div class="form-group">
-                  <label for="email">E-Mail Address</label>
-                  <br />
-                  <input type='text' id='email' name='email' style='width: 100%' required>
-              </div>
-              <div class="form-group">
-                  <label for="Phone">Phone</label>
-                  <br />
-                  <input type='text' id='phone' name='phone' style='width: 100%'>
+                  <input type='text' id='${field}' name='${field}' style='width: 100%' required>
               </div>
               <div class="text-center">
                 <input type="submit" id="submit-request" class="btn btn-primary" value="Submit" required>
diff --git a/castle/cms/browser/security/templates/secure-login.pt b/castle/cms/browser/security/templates/secure-login.pt
index 593de8bed..872881787 100644
--- a/castle/cms/browser/security/templates/secure-login.pt
+++ b/castle/cms/browser/security/templates/secure-login.pt
@@ -61,7 +61,12 @@
 
     <div tal:condition="not: view/auth/is_zope_root" id="secure-login-footer-message">
       <h3 class="text-center">${python: utils.get_registry_value('plone.login_footer_message')}</h3>
-      <h5 tal:condition="python: view.auth.request_access and not view.request_submitted" class="text-center"><a href="${portal_url}/@@request-form">Request Access</a></h5>
+      <h5 tal:condition="python: view.auth.request_access and not view.request_submitted" 
+          class="text-center">
+        <a href="${view/request_form_url}">
+          Request Access
+        </a>
+      </h5>
     </div>
 
     <script type="text/javascript" tal:attributes="src string:${context/absolute_url}/++plone++static/components/requirejs/require.js"></script>
diff --git a/castle/cms/vocabularies.py b/castle/cms/vocabularies.py
index d2c2dadca..a59bcb3dd 100644
--- a/castle/cms/vocabularies.py
+++ b/castle/cms/vocabularies.py
@@ -239,7 +239,6 @@ def get_email_template_term_value(self, email_template):
         })
 
     def __call__(self, context):
-        # import pdb; pdb.set_trace()
         catalog = api.portal.get_tool('portal_catalog')
         email_templates = [
             brain.getObject()