diff --git a/Mage.Server/config/config.xml b/Mage.Server/config/config.xml
index db1925307a..58d8a10bea 100644
--- a/Mage.Server/config/config.xml
+++ b/Mage.Server/config/config.xml
@@ -19,6 +19,17 @@
     userNamePattern     - pattern for user name validity check
     maxAiOpponents      - number of allowed AI opponents on the server
     saveGameActivated   - allow game save and replay options (not working correctly yet)
+    authenticationActivated - "true" = user have to register to signon "false" = user need not to register
+    * mail configs only needed if authentication is activated:
+    * if mailUser = "" mailgun is used otherwise nativ mail server on the system
+    googleAccount       - not supported currently
+    mailgunApiKey       - key from the mailgun domain  e.g. = "key-12121111..."
+    mailgunDomain       - domain for the mailgun message sending
+    mailSmtpHost        - hostname to send the mail
+    mailSmtpPort        - port to send the mail
+    mailUser            - username used to send the mail
+    mailPassword        - passworf of the used user to send the mail
+    mailFromAddress     - sender address
     -->
     <server serverAddress="0.0.0.0"
             serverName="mage-server"
diff --git a/Mage.Server/src/main/java/mage/server/Main.java b/Mage.Server/src/main/java/mage/server/Main.java
index 34a8d29a1f..d4869459fc 100644
--- a/Mage.Server/src/main/java/mage/server/Main.java
+++ b/Mage.Server/src/main/java/mage/server/Main.java
@@ -167,7 +167,12 @@ public class Main {
         logger.info("Config - auth. activated : " + (config.isAuthenticationActivated() ? "true" : "false"));
         logger.info("Config - mailgun api key : " + config.getMailgunApiKey());
         logger.info("Config - mailgun domain  : " + config.getMailgunDomain());
-        //logger.info("Config - google account  : " + config.getGoogleAccount());
+        logger.info("Config - mail smtp Host  : " + config.getMailSmtpHost());
+        logger.info("Config - mail smtpPort   : " + config.getMailSmtpPort());
+        logger.info("Config - mail user       : " + config.getMailUser());
+        logger.info("Config - mail passw. len.: " + config.getMailPassword().length());
+        logger.info("Config - mail from addre.: " + config.getMailFromAddress());
+        logger.info("Config - google account  : " + config.getGoogleAccount());
 
         Connection connection = new Connection("&maxPoolSize=" + config.getMaxPoolSize());
         connection.setHost(config.getServerAddress());
@@ -406,8 +411,8 @@ public class Main {
                 MatchProto match = table.getMatch();
                 for (MatchPlayerProto player : match.getPlayersList()) {
                     UserStats userStats = UserStatsRepository.instance.getUser(player.getName());
-                    UserStatsProto proto = userStats != null ? userStats.getProto() :
-                            UserStatsProto.newBuilder().setName(player.getName()).build();
+                    UserStatsProto proto = userStats != null ? userStats.getProto()
+                            : UserStatsProto.newBuilder().setName(player.getName()).build();
                     UserStatsProto.Builder builder = UserStatsProto.newBuilder(proto)
                             .setMatches(proto.getMatches() + 1);
                     switch (player.getQuit()) {
@@ -436,8 +441,8 @@ public class Main {
                 TourneyProto tourney = table.getTourney();
                 for (TourneyPlayerProto player : tourney.getPlayersList()) {
                     UserStats userStats = UserStatsRepository.instance.getUser(player.getName());
-                    UserStatsProto proto = userStats != null ? userStats.getProto() :
-                            UserStatsProto.newBuilder().setName(player.getName()).build();
+                    UserStatsProto proto = userStats != null ? userStats.getProto()
+                            : UserStatsProto.newBuilder().setName(player.getName()).build();
                     UserStatsProto.Builder builder = UserStatsProto.newBuilder(proto)
                             .setTourneys(proto.getTourneys() + 1);
                     switch (player.getQuit()) {
diff --git a/Mage.Server/src/main/java/mage/server/Session.java b/Mage.Server/src/main/java/mage/server/Session.java
index da36d1d892..88dccf4912 100644
--- a/Mage.Server/src/main/java/mage/server/Session.java
+++ b/Mage.Server/src/main/java/mage/server/Session.java
@@ -99,8 +99,15 @@ public class Session {
                 return returnMessage;
             }
             AuthorizedUserRepository.instance.add(userName, password, email);
-            if (MailClient.sendMessage(email, "XMage Registration Completed",
-                    "You are successfully registered as " + userName + ".")) {
+            String subject = "XMage Registration Completed";
+            String text = "You are successfully registered as " + userName + ".";
+            boolean success;
+            if (!ConfigSettings.getInstance().getMailUser().isEmpty()) {
+                success = MailClient.sendMessage(email, subject, text);
+            } else {
+                success = MailgunClient.sendMessage(email, subject, text);
+            }
+            if (success) {
                 logger.info("Sent a registration confirmation email to " + email + " for " + userName);
             } else {
                 logger.error("Failed sending a registration confirmation email to " + email + " for " + userName);