diff --git a/app/client/views/application/application.html b/app/client/views/application/application.html
index 231b5cbad..6f12fb565 100644
--- a/app/client/views/application/application.html
+++ b/app/client/views/application/application.html
@@ -52,14 +52,14 @@
             <label>Graduation Year</label>
             <select name="year" ng-model="user.profile.graduationYear">
               <option value="">Graduation Year</option>
-              <option value="2016">2020</option>
-              <option value="2017">2021</option>
-              <option value="2018">2022</option>
-              <option value="2019">2023</option>
-              <option value="2016">2024</option>
-              <option value="2017">2025</option>
-              <option value="2018">2026</option>
-              <option value="2019">2027</option>
+              <option value="2020">2020</option>
+              <option value="2021">2021</option>
+              <option value="2022">2022</option>
+              <option value="2023">2023</option>
+              <option value="2024">2024</option>
+              <option value="2025">2025</option>
+              <option value="2026">2026</option>
+              <option value="2027">2027</option>
             </select>
           </div>
 
diff --git a/app/server/models/User.js b/app/server/models/User.js
index 252af850e..405eef690 100644
--- a/app/server/models/User.js
+++ b/app/server/models/User.js
@@ -326,13 +326,15 @@ schema.statics.getByToken = function (token, callback) {
 };
 
 schema.statics.validateProfile = function (profile, cb) {
+  var validYears = ["2020", "2021", "2022", "2023", "2024", "2025", "2026", "2027"];
+  var validGenders = ["M", "F", "O", "N"];
   return cb(
     !(
       profile.name.length > 0 &&
       profile.adult &&
       profile.school.length > 0 &&
-      ["2016", "2017", "2018", "2019"].indexOf(profile.graduationYear) > -1 &&
-      ["M", "F", "O", "N"].indexOf(profile.gender) > -1
+      validYears.indexOf(profile.graduationYear) > -1 &&
+      validGenders.indexOf(profile.gender) > -1
     )
   );
 };