diff --git a/src/_locales/en/messages.json b/src/_locales/en/messages.json
index 7963181d1d..f39eac379e 100644
--- a/src/_locales/en/messages.json
+++ b/src/_locales/en/messages.json
@@ -694,5 +694,13 @@
   "shareVaultInfo": {
     "message": "Create an organization to securely share your logins with other users.",
     "description": "Create an organization to securely share your logins with other users."
+  },
+  "contribute": {
+    "message": "You can contribute to!",
+    "description": "You can contribute to!"
+  },
+  "learnMore": {
+    "message": "Learn more",
+    "description": "Learn more"
   }
 }
diff --git a/src/popup/app/settings/settingsController.js b/src/popup/app/settings/settingsController.js
index af02247f0f..cb0be5a9b2 100644
--- a/src/popup/app/settings/settingsController.js
+++ b/src/popup/app/settings/settingsController.js
@@ -49,6 +49,7 @@
         };
 
         $scope.lock = function () {
+            $analytics.eventTrack('Lock Now');
             lockService.lock().then(function () {
                 return $state.go('lock', {
                     animation: 'in-slide-up'
diff --git a/src/popup/app/settings/settingsCreditsController.js b/src/popup/app/settings/settingsCreditsController.js
index 223fdc68b4..1f7dabe95a 100644
--- a/src/popup/app/settings/settingsCreditsController.js
+++ b/src/popup/app/settings/settingsCreditsController.js
@@ -1,6 +1,14 @@
 angular
     .module('bit.settings')
 
-    .controller('settingsCreditsController', function ($scope, i18nService) {
+    .controller('settingsCreditsController', function ($scope, i18nService, $analytics) {
         $scope.i18n = i18nService;
+
+        $scope.learnMore = function () {
+            $analytics.eventTrack('Contribute Learn More');
+
+            chrome.tabs.create({
+                url: 'https://github.com/bitwarden/browser/blob/master/CONTRIBUTING.md'
+            });
+        };
     });
diff --git a/src/popup/app/settings/settingsEditFolderController.js b/src/popup/app/settings/settingsEditFolderController.js
index 4cd6f060c1..4a70f7d35b 100644
--- a/src/popup/app/settings/settingsEditFolderController.js
+++ b/src/popup/app/settings/settingsEditFolderController.js
@@ -6,6 +6,7 @@
         $scope.i18n = i18nService;
         $scope.folder = {};
         var folderId = $stateParams.folderId;
+        $('#name').focus();
 
         folderService.get(folderId, function (folder) {
             $q.when(folder.decrypt()).then(function (model) {
diff --git a/src/popup/app/settings/views/settingsCredits.html b/src/popup/app/settings/views/settingsCredits.html
index 0939205d15..ad31781a4c 100644
--- a/src/popup/app/settings/views/settingsCredits.html
+++ b/src/popup/app/settings/views/settingsCredits.html
@@ -26,6 +26,9 @@
                     <b>@SW1FT</b> - Portuguese
                 </div>
             </div>
+            <div class="list-section-footer">
+                {{i18n.contribute}} <a href="" ng-click="learnMore()">{{i18n.learnMore}}</a>
+            </div>
         </div>
     </div>
 </div>
diff --git a/src/popup/app/tools/toolsExportController.js b/src/popup/app/tools/toolsExportController.js
index ebbfc7d377..7d3a59133a 100644
--- a/src/popup/app/tools/toolsExportController.js
+++ b/src/popup/app/tools/toolsExportController.js
@@ -5,6 +5,8 @@
         i18nService, cryptoService, userService, folderService, loginService) {
         $scope.i18n = i18nService;
 
+        $('#master-password').focus();
+
         $scope.submitPromise = null;
         $scope.submit = function () {
             $scope.submitPromise = checkPassword().then(function () {
diff --git a/src/popup/app/vault/vaultEditLoginController.js b/src/popup/app/vault/vaultEditLoginController.js
index 9bd604d965..ce6872e1f7 100644
--- a/src/popup/app/vault/vaultEditLoginController.js
+++ b/src/popup/app/vault/vaultEditLoginController.js
@@ -12,6 +12,8 @@ angular
             folderId: null
         };
 
+        $('#name').focus();
+
         if ($stateParams.login) {
             angular.extend($scope.login, $stateParams.login);
         }