diff --git a/wizard-common/src/main/java/org/cobbzilla/wizard/auth/ChangePasswordRequest.java b/wizard-common/src/main/java/org/cobbzilla/wizard/auth/ChangePasswordRequest.java
index 2b8ea10..45a0b97 100644
--- a/wizard-common/src/main/java/org/cobbzilla/wizard/auth/ChangePasswordRequest.java
+++ b/wizard-common/src/main/java/org/cobbzilla/wizard/auth/ChangePasswordRequest.java
@@ -6,17 +6,22 @@ import lombok.Setter;
 import lombok.experimental.Accessors;
 import org.cobbzilla.wizard.validation.HasValue;
 
+import static org.cobbzilla.util.daemon.ZillaRuntime.empty;
+
 @NoArgsConstructor @Accessors(chain=true)
 public class ChangePasswordRequest {
 
     @Getter @Setter private String uuid;
 
-    @HasValue(message="error.changePassword.oldPassword.required")
+    @HasValue(message="err.currentPassword.required")
     @Getter @Setter private String oldPassword;
 
-    @HasValue(message="error.changePassword.newPassword.required")
+    @HasValue(message="err.password.required")
     @Getter @Setter private String newPassword;
 
+    @Getter @Setter private String totpToken;
+    public boolean hasTotpToken () { return !empty(totpToken); }
+
     @Getter @Setter private boolean sendInvite = false;
 
     public ChangePasswordRequest (String oldPassword, String newPassword) {