diff --git a/cco/member/auth.pt b/cco/member/auth.pt
index c6355e7..ccc2852 100644
--- a/cco/member/auth.pt
+++ b/cco/member/auth.pt
@@ -4,7 +4,9 @@
 <metal:login define-macro="login_form"
              i18n:domain="cco.member"
              tal:define="principal request/principal/id;
-	   			   camefrom python:request.get('camefrom') or request.URL[-1]">
+                   baseUrl python:request.URL[-1];
+	   			   camefrom python:request.get('camefrom') or baseUrl;
+				   dummy item/checkAuth">
     <p style="color: Red"
        tal:condition="request/error_message|nothing"
        i18n:translate=""
@@ -12,7 +14,7 @@
     <h2 i18n:translate="title_login">Login</h2>
 	<p i18n:domain="loops"
 	   tal:condition="item/oidc_allowed">
-	  <a tal:attributes="href string:/@@auth_login?camefrom=$camefrom"
+	  <a tal:attributes="href string:$baseUrl/@@auth_login?camefrom=$camefrom"
          i18n:translate="login-with-oidc">Login with OpenID Connect (Zitadel)</a>
 	</p>
     <div>
@@ -23,8 +25,7 @@
             tal:define="submitted python:
                             principal != 'zope.anybody' and 'SUBMIT' in request">
         <tal:redirect condition="submitted">
-            <span tal:define="dummy python:request.response.redirect(
-                                request.get('camefrom') or request.URL[-1])" />
+            <span tal:define="dummy python:request.response.redirect(camefrom)" />
         </tal:redirect>
         <tal:form condition="not:submitted">
           <input type="hidden" name="base_url"
@@ -50,7 +51,7 @@
                      i18n:attributes="value button_login_2factor" />
           </div>
           <input type="hidden" name="camefrom"
-                 tal:attributes="value request/camefrom | nothing">
+                 tal:attributes="value camefrom">
         </tal:form>
       </form>
     </div>