diff --git a/src/_locales/en/messages.json b/src/_locales/en/messages.json
index cb9602baf9b..8d10d4f351b 100644
--- a/src/_locales/en/messages.json
+++ b/src/_locales/en/messages.json
@@ -678,5 +678,13 @@
   "shared": {
     "message": "Shared",
     "desription": "Shared"
+  },
+  "shareVault": {
+    "message": "Share Your Vault",
+    "desription": "Share Your Vault"
+  },
+  "shareVaultInfo": {
+    "message": "Create an organization to securely share your logins with other users.",
+    "desription": "Create an organization to securely share your logins with other users."
   }
 }
diff --git a/src/popup/app/tools/toolsController.js b/src/popup/app/tools/toolsController.js
index 92db3540f8e..90de3f95166 100644
--- a/src/popup/app/tools/toolsController.js
+++ b/src/popup/app/tools/toolsController.js
@@ -3,8 +3,8 @@
 
     .controller('toolsController', function ($scope, SweetAlert, i18nService) {
         $scope.i18n = i18nService;
-        $scope.launchWebVault = function () {
-            chrome.tabs.create({ url: 'https://vault.bitwarden.com' });
+        $scope.launchWebVault = function (createOrg) {
+            chrome.tabs.create({ url: 'https://vault.bitwarden.com/#/' + (createOrg ? '?org=free' : '') });
         };
 
         $scope.launchiOS = function () {
diff --git a/src/popup/app/tools/views/tools.html b/src/popup/app/tools/views/tools.html
index 136aed4642e..da905fc66d8 100644
--- a/src/popup/app/tools/views/tools.html
+++ b/src/popup/app/tools/views/tools.html
@@ -25,6 +25,11 @@
                     <span class="text">{{i18n.bitAndrVault}}</span>
                     <span class="detail">{{i18n.bitAndrVaultInfo}}</span>
                 </a>
+                <a class="list-section-item wrap" href="" ng-click="launchWebVault(true)">
+                    <span class="leading-icon" style="color: #8977af;"><i class="fa fa-share-alt fa-fw"></i></span>
+                    <span class="text">{{i18n.shareVault}}</span>
+                    <span class="detail">{{i18n.shareVaultInfo}}</span>
+                </a>
                 <a class="list-section-item wrap" href="" ng-click="launchImport()">
                     <span class="leading-icon" style="color: #6fc2ff;"><i class="fa fa-cloud-upload fa-fw"></i></span>
                     <span class="text">{{i18n.importLogins}}</span>
diff --git a/src/popup/app/vault/views/vaultViewFolder.html b/src/popup/app/vault/views/vaultViewFolder.html
index 123f1de1345..bd54c45f4ea 100644
--- a/src/popup/app/vault/views/vaultViewFolder.html
+++ b/src/popup/app/vault/views/vaultViewFolder.html
@@ -32,7 +32,10 @@
                           data-clipboard-text="{{login.username}}" ng-class="{'disabled': !login.username}">
                         <i class="fa fa-lg fa-user"></i>
                     </span>
-                    <span class="text">{{login.name}}</span>
+                    <span class="text">
+                        {{login.name}}
+                        <i class="fa fa-share-alt text-muted" ng-if="login.organizationId" title="{{i18n.shared}}"></i>
+                    </span>
                     <span class="detail">{{login.username}}</span>
                 </a>
             </div>