diff --git a/client/coral-admin/src/containers/SuspendUserDialog.js b/client/coral-admin/src/containers/SuspendUserDialog.js
index 5c554e70c..ce70e5c30 100644
--- a/client/coral-admin/src/containers/SuspendUserDialog.js
+++ b/client/coral-admin/src/containers/SuspendUserDialog.js
@@ -18,7 +18,7 @@ class SuspendUserDialogContainer extends Component {
     const {userId, username, commentStatus, commentId, hideSuspendUserDialog, setCommentStatus, suspendUser, notify} = this.props;
     hideSuspendUserDialog();
     try {
-      await suspendUser({id: userId, message, until});
+      await suspendUser({id: userId, until});
       notify(
         'success',
         t('suspenduser.notify_suspend_until', username, timeago(until)),
diff --git a/client/coral-framework/graphql/fragments.js b/client/coral-framework/graphql/fragments.js
index c2a03131b..aa8cc14e0 100644
--- a/client/coral-framework/graphql/fragments.js
+++ b/client/coral-framework/graphql/fragments.js
@@ -3,6 +3,7 @@ import {createDefaultResponseFragments} from '../utils';
 // fragments defined here are automatically registered.
 export default {
   ...createDefaultResponseFragments(
+    'SetUserSuspensionStatusResponse',
     'SetCommentStatusResponse',
     'SuspendUserResponse',
     'RejectUsernameResponse',
diff --git a/client/coral-framework/graphql/mutations.js b/client/coral-framework/graphql/mutations.js
index 3a543a738..668837ade 100644
--- a/client/coral-framework/graphql/mutations.js
+++ b/client/coral-framework/graphql/mutations.js
@@ -160,9 +160,9 @@ export const withSetCommentStatus = withMutation(
 
 export const withSuspendUser = withMutation(
   gql`
-    mutation SuspendUser($input: SuspendUserInput!) {
-      suspendUser(input: $input) {
-        ...SuspendUserResponse
+    mutation SuspendUser($input: SetUserSuspensionStatusInput!) {
+      setUserSuspensionStatus(input: $input) {
+        ...SetUserSuspensionStatusResponse
       }
     }
   `, {
diff --git a/test/e2e/specs/04_userStatus.js b/test/e2e/specs/04_userStatus.js
index 5a7593e53..5fa1d51cf 100644
--- a/test/e2e/specs/04_userStatus.js
+++ b/test/e2e/specs/04_userStatus.js
@@ -19,7 +19,15 @@ module.exports = {
     const adminPage = client.page.admin();
     const {testData: {admin}} = client.globals;
 
-    adminPage.navigateAndLogin(admin);
+    adminPage
+      .navigate()
+      .waitForElementVisible('@loginLayout')
+      .waitForElementVisible('@signInForm')
+      .setValue('@emailInput', admin.email)
+      .setValue('@passwordInput', admin.password)
+      .waitForElementVisible('@signInButton')
+      .click('@signInButton')
+      .waitForElementVisible('@moderationContainer');
   },
   'admin flags user\'s username as offensive': (client) => {
     const embedStream = client.page.embedStream();