diff --git a/entrypoint.sh b/entrypoint.sh
index bf47e8db584bcb059c40272a39a0c25fb456863d..859fc47ee8cfb3d876c85745bd6436277c7c7a60 100755
--- a/entrypoint.sh
+++ b/entrypoint.sh
@@ -30,7 +30,7 @@ if [ ! -f /etc/apache2/saml2/idp.xml ]; then
 fi
 
 # Create mod_auth_mellon service provider config
-if [ ! -f /etc/apache2/saml2/${HOST}.xml ]; then
+if [ ! -f /etc/apache2/saml2/sp.xml ]; then
     pushd /etc/apache2/saml2
      echo -e "Generating new service provider certificate.\n\n" 
      /usr/sbin/mellon_create_metadata https://${HOST}/mellon/metadata https://${HOST}/mellon
diff --git a/mod_auth_mellon.conf b/mod_auth_mellon.conf
index cbcacde7e723679c70c72268d70b7b3fcafaa505..7b9b0ac8897216a1915dd16eea2cd91c06e2035d 100644
--- a/mod_auth_mellon.conf
+++ b/mod_auth_mellon.conf
@@ -5,7 +5,6 @@
  MellonSPCertFile       /etc/apache2/saml2/sp.cert
  MellonSPMetadataFile   /etc/apache2/saml2/sp.xml
  MellonIdPMetadataFile  /etc/apache2/saml2/idp.xml
- MellonSignatureMethod rsa-sha1
 </Location>
 
 <Location /admin >