diff --git a/service/src/main/java/org/whispersystems/textsecuregcm/controllers/KeysController.java b/service/src/main/java/org/whispersystems/textsecuregcm/controllers/KeysController.java
index ead9e87f6..95a6508b7 100644
--- a/service/src/main/java/org/whispersystems/textsecuregcm/controllers/KeysController.java
+++ b/service/src/main/java/org/whispersystems/textsecuregcm/controllers/KeysController.java
@@ -164,8 +164,7 @@ public class KeysController {
   @PUT
   @Path("/signed")
   @Consumes(MediaType.APPLICATION_JSON)
-  public void setSignedKey(@Auth DisabledPermittedAccount disabledPermittedAccount, @Valid SignedPreKey signedPreKey) {
-    Account account           = disabledPermittedAccount.getAccount();
+  public void setSignedKey(@Auth Account account, @Valid SignedPreKey signedPreKey) {
     Device  device            = account.getAuthenticatedDevice().get();
     boolean wasAccountEnabled = account.isEnabled();
 
diff --git a/service/src/test/java/org/whispersystems/textsecuregcm/tests/controllers/KeyControllerTest.java b/service/src/test/java/org/whispersystems/textsecuregcm/tests/controllers/KeyControllerTest.java
index 5319c1b78..3eb0b4be7 100644
--- a/service/src/test/java/org/whispersystems/textsecuregcm/tests/controllers/KeyControllerTest.java
+++ b/service/src/test/java/org/whispersystems/textsecuregcm/tests/controllers/KeyControllerTest.java
@@ -191,10 +191,7 @@ public class KeyControllerTest {
                                  .header("Authorization", AuthHelper.getAuthHeader(AuthHelper.DISABLED_NUMBER, AuthHelper.DISABLED_PASSWORD))
                                  .put(Entity.entity(test, MediaType.APPLICATION_JSON_TYPE));
 
-    assertThat(response.getStatus()).isEqualTo(204);
-
-    verify(AuthHelper.DISABLED_DEVICE).setSignedPreKey(eq(test));
-    verify(accounts).update(eq(AuthHelper.DISABLED_ACCOUNT));
+    assertThat(response.getStatus()).isEqualTo(401);
   }
 
   @Test