diff --git a/src/main/java/caosdb/server/jobs/core/AccessControl.java b/src/main/java/caosdb/server/jobs/core/AccessControl.java
index 11fb60b576e29f43d815f954d5d83d2f5aa278cd..8b51cd582933d9c993c2427be7c399e7dc553df2 100644
--- a/src/main/java/caosdb/server/jobs/core/AccessControl.java
+++ b/src/main/java/caosdb/server/jobs/core/AccessControl.java
@@ -68,8 +68,10 @@ public class AccessControl extends ContainerJob {
         if (par1.hasId() && par1.getId() > 0) {
           Database.execute(new RetrieveSparseEntity(par1), getTransaction().getAccess());
         }
-        if (par1.hasName() && par1.getName().equals("CommentAnnotation") && subject
-            .isPermitted(getTransaction().getClass().getSimpleName() + ":CommentAnnotation")) {
+        if (par1.hasName()
+            && par1.getName().equals("CommentAnnotation")
+            && subject.isPermitted(
+                getTransaction().getClass().getSimpleName() + ":CommentAnnotation")) {
           continue;
         }
       }
diff --git a/src/main/java/caosdb/server/jobs/core/TestMail.java b/src/main/java/caosdb/server/jobs/core/TestMail.java
index 2f005915b7b4d8a820e8c083b09ba7553b840d1c..e529265a36cac6b483215500edc5b9793ef60afc 100644
--- a/src/main/java/caosdb/server/jobs/core/TestMail.java
+++ b/src/main/java/caosdb/server/jobs/core/TestMail.java
@@ -38,17 +38,16 @@ import caosdb.server.utils.mail.Mail;
         "Value may be any mail address. Send a test mail to the given mail address. Works only if server is in debug mode.")
 public class TestMail extends FlagJob {
 
-  private static final String ADMIN_NAME =
-      CaosDBServer.getServerProperty(ServerProperties.KEY_ADMIN_NAME);
-  private static final String ADMIN_EMAIL =
-      CaosDBServer.getServerProperty(ServerProperties.KEY_ADMIN_EMAIL);
+  private static final String NAME =
+      CaosDBServer.getServerProperty(ServerProperties.KEY_NO_REPLY_NAME);
+  private static final String EMAIL =
+      CaosDBServer.getServerProperty(ServerProperties.KEY_NO_REPLY_EMAIL);
 
   @Override
   protected void job(final String value) {
     if (CaosDBServer.isDebugMode() && value != null) {
       if (Utils.isRFC822Compliant(value)) {
-        final Mail m =
-            new Mail(ADMIN_NAME, ADMIN_EMAIL, null, value, "Test mail", "This is a test mail.");
+        final Mail m = new Mail(NAME, EMAIL, null, value, "Test mail", "This is a test mail.");
         m.send();
         getContainer()
             .addMessage(new Message(MessageType.Info, 0, "A mail has been send to " + value));