diff --git a/public/js/controllers/settingsCtrl.js b/public/js/controllers/settingsCtrl.js
index 11ad1c1a6b..d3886f9d79 100644
--- a/public/js/controllers/settingsCtrl.js
+++ b/public/js/controllers/settingsCtrl.js
@@ -64,12 +64,14 @@ habitrpg.controller('SettingsCtrl',
       if(value === true){
         $scope.restoreValues.stats = angular.copy(User.user.stats);
         $scope.restoreValues.items = angular.copy(User.user.items);
+        $scope.restoreValues.achievements = {streak: User.user.achievements.streak};
       }
     })
 
     $scope.restore = function(){
       var stats = $scope.restoreValues.stats,
-        items = $scope.restoreValues.items;
+        items = $scope.restoreValues.items,
+        achievements = $scope.restoreValues.achievements;
       User.setMultiple({
         "stats.hp": stats.hp,
         "stats.exp": stats.exp,
@@ -78,7 +80,8 @@ habitrpg.controller('SettingsCtrl',
         "items.weapon": items.weapon,
         "items.armor": items.armor,
         "items.head": items.head,
-        "items.shield": items.shield
+        "items.shield": items.shield,
+        "achievements.streak": achievements.streak
       });
       $rootScope.modals.restore = false;
     }
diff --git a/views/shared/modals/achievements.jade b/views/shared/modals/achievements.jade
index a68e1e794c..21140bccef 100644
--- a/views/shared/modals/achievements.jade
+++ b/views/shared/modals/achievements.jade
@@ -7,7 +7,7 @@ div(modal='modals.achievements.streak')
     .achievement.achievement-thermometer
     | You have stacked your "Streaker" Achievement! Every 21 days of streak, you gain 1 achievement point here.
   .modal-footer
-    button.btn.btn-default.cancel(ng-click='modals.achievements.streak = false') Cancel
+    button.btn.btn-default.cancel(ng-click='modals.achievements.streak = false') Ok
 
 // Max Gear
 div(modal='modals.achievements.maxGear')
@@ -17,7 +17,7 @@ div(modal='modals.achievements.maxGear')
     .achievement.achievement-armor
     | You have earned the "Ultimate Gear" Achievement for upgrading to the maximum gear set!
   .modal-footer
-    button.btn.btn-default.cancel(ng-click='modals.achievements.maxGear = false') Cancel
+    button.btn.btn-default.cancel(ng-click='modals.achievements.maxGear = false') Ok
 
 // Beast Master
 div(modal='modals.achievements.beastmaster')
@@ -28,6 +28,6 @@ div(modal='modals.achievements.beastmaster')
       .achievement.achievement-rat
       | You have earned the "Beast Master" Achievement for collecting all the pets!
   .modal-footer
-    button.btn.btn-default.cancel(ng-click='modals.achievements.beastmaster = false') Cancel
+    button.btn.btn-default.cancel(ng-click='modals.achievements.beastmaster = false') Ok
 
 
diff --git a/views/shared/modals/settings.jade b/views/shared/modals/settings.jade
index 6e96247eb1..9a381b6427 100644
--- a/views/shared/modals/settings.jade
+++ b/views/shared/modals/settings.jade
@@ -42,6 +42,10 @@ div(ng-controller='SettingsCtrl')
           .option-group.option-medium
             input.option-content(type='number', data-for='items.shield', ng-model='restoreValues.items.shield')
             span.input-suffix Shield
+          h3 Streak Achievements
+          .option-group.option-medium
+            input.option-content(type='number', data-for='achievements.streak', ng-model='restoreValues.achievements.streak')
+            span.input-suffix 21-Day Streak
     .modal-footer
       button.btn.btn-primary(ng-click='restore()') Save & Close