diff --git a/admin/admin.html b/admin/admin.html
index 81d60d87029..5d6edcdb08c 100644
--- a/admin/admin.html
+++ b/admin/admin.html
@@ -54,9 +54,11 @@
                   }
                   echo "</optgroup>\n";
               }
-              foreach ($users as $user) {
-                  $fullname = fullname($user, true);
-                  echo "<option value=\"$user->id\">".$fullname.", ".$user->email."</option>\n";
+              if (!empty($users)) {
+                  foreach ($users as $user) {
+                      $fullname = fullname($user, true);
+                      echo "<option value=\"$user->id\">".$fullname.", ".$user->email."</option>\n";
+                  }
               }
           ?>
          </select>
diff --git a/admin/creators.html b/admin/creators.html
index 09e6023d679..2acbba68a95 100644
--- a/admin/creators.html
+++ b/admin/creators.html
@@ -46,9 +46,11 @@
                   }
                   echo "</optgroup>\n";
               }
-              foreach ($users as $user) {
-                  $fullname = fullname($user, true);
-                  echo "<option value=\"$user->id\">".$fullname.", ".$user->email."</option>\n";
+              if (!empty($users)) {
+                  foreach ($users as $user) {
+                      $fullname = fullname($user, true);
+                      echo "<option value=\"$user->id\">".$fullname.", ".$user->email."</option>\n";
+                  }
               }
           ?>
          </select>