Harden code a bit against edge case#1073

CarlSchwan wants to merge 2 commits intomasternextcloud/user_saml:masterfrom

carl/hardennextcloud/user_saml:carl/hardenCopy head branch name to clipboard