diff --git a/.env b/.env
index cd79e581..32d149df 100644
--- a/.env
+++ b/.env
@@ -46,7 +46,7 @@ USE_GRAVATAR=0
 # Please note that the php.ini setting upload_max_filesize also limits the maximum size of uploaded files
 MAX_ATTACHMENT_FILE_SIZE="100M"
 
-# The public reachable URL of this Part-DB installation. This is used for generating links to the website in emails and so on
+# The public reachable URL of this Part-DB installation. This is used for generating links in SAML and email templates
 # This must end with a slash!
 DEFAULT_URI="https://partdb.changeme.invalid/"
 
@@ -181,6 +181,7 @@ EDA_KICAD_CATEGORY_DEPTH=0
 # SAML Single sign on-settings
 ###################################################################################
 # Set this to 1 to enable SAML single sign on
+# Be also sure to set the correct values for DEFAULT_URI
 SAML_ENABLED=0
 
 # Set to 1, if your Part-DB installation is behind a reverse proxy and you want to use SAML
diff --git a/config/packages/nbgrp_onelogin_saml.yaml b/config/packages/nbgrp_onelogin_saml.yaml
index 84a1b8bc..2b1974f3 100644
--- a/config/packages/nbgrp_onelogin_saml.yaml
+++ b/config/packages/nbgrp_onelogin_saml.yaml
@@ -32,7 +32,7 @@ nbgrp_onelogin_saml:
         privateKey: '%env(string:default:saml.sp.privateKey:string:SAMLP_SP_PRIVATE_KEY)%'
 
       # Optional settings
-      #baseurl: 'http://myapp.com'
+      baseurl: '%partdb.default_uri%saml/'
       strict: true
       debug: false
       security: