Apply more fixes from pycroft registry.sh
Apply more fixes from pycroft registry.sh

MarauderXtreme/sipa,lukasjuhrich/sipa,agdsn/sipa,agdsn/sipa,lukasjuhrich/sipa,agdsn/sipa,MarauderXtreme/sipa,lukasjuhrich/sipa,MarauderXtreme/sipa,lukasjuhrich/sipa,agdsn/sipa