diff --git a/ATxCommon/SystemChecks.cs b/ATxCommon/SystemChecks.cs
index e65c8f1699f8b91d3fcb45e09d49fadcf471d826..62092054c50d1ecd5a247d90d2709afbdd4d26b4 100644
--- a/ATxCommon/SystemChecks.cs
+++ b/ATxCommon/SystemChecks.cs
@@ -121,11 +121,7 @@ namespace ATxCommon
                 username = (string)collection.Cast<ManagementBaseObject>().First()["UserName"];
             }
             catch (Exception ex) {
-                // TODO / FIXME: combine log and admin-email!
-                var msg = string.Format("Error in getCurrentUsername(): {0}", ex.Message);
-                Log.Error(msg);
-                // TODO: FIXME!
-                // SendAdminEmail(msg);
+                Log.Error("Error in getCurrentUsername(): {0}", ex.Message);
             }
             return username == "";
         }