diff --git a/cam/filters/archimed.py b/cam/filters/archimed.py
index 5e1a2cd..1163103 100644
--- a/cam/filters/archimed.py
+++ b/cam/filters/archimed.py
@@ -159,7 +159,7 @@ def is_user_locally_logged_in(env, request, response):
 
 def is_logged_in(env, values, request, response):
     session = env['beaker.session']
-    if response.msg and response and 'account_logoff' in response.msg:
+    if response.msg and 'account_logoff' in response.msg:
         session['locally_logged_in'] = True
     else:
         session['locally_logged_in'] = False
diff --git a/cam/mappers/archimed_saml.py b/cam/mappers/archimed_saml.py
index ff89fb6..cf2e07c 100644
--- a/cam/mappers/archimed_saml.py
+++ b/cam/mappers/archimed_saml.py
@@ -51,7 +51,7 @@ mapping = [
             'on_response': [{'auth': 'store_credentials_in_session'}]
             },
         {
-            'path': r'/%s' % base,
+            'path': r'/',
             'method': 'GET',
             'on_response': [{
                 'content-types': ['text/html'],