diff --git a/app/models/gender.rb b/app/models/gender.rb
index c0cb89a2..09013944 100644
--- a/app/models/gender.rb
+++ b/app/models/gender.rb
@@ -9,10 +9,12 @@ class Gender < ApplicationRecord
       1
     when /Male|M|2/i
       2
-    when /Another\s*Gender|Gender Identity not listed above|3/i
-      4
+    when /Another\s*Gender|Gender Identity not listed above|3|7/i
+      3
     when /Non-Binary|N|4/i
       4
+    when /Prefer not to disclose|6/i
+      99
     when %r{^#*N/*A$}i
       nil
     else