diff --git a/server/sendemail.js b/server/sendemail.js
index 1aa75f2..051ec59 100644
--- a/server/sendemail.js
+++ b/server/sendemail.js
@@ -57,7 +57,7 @@ module.exports = {
       .then(console.log)
       .catch(console.error);
   },
-  sendEmail_Normale: function (username, to, subject, html) {
+  sendEmail_Normale: function (to, subject, html) {
 
     // setup e-mail data with unicode symbols
     var mailOptions = {
@@ -118,6 +118,9 @@ module.exports = {
     };
 
     this.sendEmail_base('registration/' + lang, user, emailto, mylocalsconf);
+
+    // Send to the Admin an Email
+    this.sendEmail_Normale(process.env.EMAIL_FROM, 'Nuova Registrazione: (' + user + ")", 'Effettuata una Nuova Registrazione!<br>Username:' + user + '<br></br>Email: ' + emailto +'<br>')
   },
   sendEmail_RequestNewPassword: function (lang, emailto, idapp, tokenforgot) {
 
diff --git a/server/server.js b/server/server.js
index 9a36749..393ea46 100644
--- a/server/server.js
+++ b/server/server.js
@@ -111,7 +111,9 @@ if ((process.env.NODE_ENV === 'production') || (process.env.NODE_ENV === 'test')
   httpServer.listen(port);
 }
 
-testmsgwebpush();
+if (process.env.PROD !== 1) {
+  testmsgwebpush();
+}
 
 function testmsgwebpush() {
   var { User } = require('./models/user');
diff --git a/server/tools/general.js b/server/tools/general.js
index 232c91b..567e6e6 100644
--- a/server/tools/general.js
+++ b/server/tools/general.js
@@ -176,3 +176,4 @@ module.exports = {
   // Test
 
 };
+