diff --git a/cps/admin.py b/cps/admin.py
index 3e703f21..43c15836 100644
--- a/cps/admin.py
+++ b/cps/admin.py
@@ -933,8 +933,8 @@ def edit_user(user_id):
 @login_required
 @admin_required
 def reset_user_password(user_id):
-    #if not config.config_public_reg:
-    #    abort(404)
+    if not config.get_mail_server_configured():
+        abort(404)
     if current_user is not None and current_user.is_authenticated:
         ret, message = reset_password(user_id)
         if ret == 1: