diff --git a/noise.graphql b/noise.graphql
index 4fcc85b..83187f9 100644
--- a/noise.graphql
+++ b/noise.graphql
@@ -31,6 +31,7 @@ type UserPreferences {
     notificationPreference: NotificationPreference!
     # TODO: external servers
     # TODO: security
+    securityPreference: SecurityPreference!
 }
 
 type PrivacyPreference {
@@ -51,10 +52,6 @@ type PrivacyPreference {
     info: RestrictionPolicy!
     infoUserLimit: [String!]
     infoServerLimit: [Url!]
-
-    # One-purpose-passwords
-    # TODO: move to security
-    accountTokens: [ID!]!
 }
 
 type NotificationPreference {
@@ -62,6 +59,14 @@ type NotificationPreference {
     doNotDisturb: Boolean!
 }
 
+type SecurityPreference {
+    # One-purpose-passwords
+    accountTokens: [ID!]!
+
+    # The account's password hash
+    passwordHash: String!
+}
+
 # Everyone = Including all = Excluding none
 # None = Including none = Excluding all
 enum RestrictionPolicy {