diff --git a/js/app/controllers/share.js b/js/app/controllers/share.js
index 7cf6c949..d8437fd0 100644
--- a/js/app/controllers/share.js
+++ b/js/app/controllers/share.js
@@ -59,8 +59,8 @@ angular.module('passmanApp')
 			$location.path('/vault/' + $scope.storedCredential.vault_id);
 		};
 
-
-
+		console.log($location);
+		$scope.share_link = $location.$$protocol + '://'+ $location.$$host + OC.generateUrl('apps/passman/share/public#') + $scope.storedCredential.guid;
 		$scope.share_settings = {
 			linkSharing:{
 				enabled: false,
diff --git a/js/templates.js b/js/templates.js
index ffccd238..b7d797d9 100644
--- a/js/templates.js
+++ b/js/templates.js
@@ -89,7 +89,7 @@ angular.module('views/partials/forms/share_credential/basics.html', []).run(['$t
 angular.module('views/partials/forms/share_credential/expire_settings.html', []).run(['$templateCache', function($templateCache) {
   'use strict';
   $templateCache.put('views/partials/forms/share_credential/expire_settings.html',
-    '<div class="row"><div class="col-xs-12 col-md-6"><input type="checkbox" ng-model="share_settings.linkSharing.enabled"> Enable link sharing.<div>Expire settings:<select ng-model="share_settings.linkSharing.settings.type"><option value="null">Does not expire</option><option value="view_amount">Expire after a certain amount of views</option><option value="date">Expire after a date</option></select></div><div ng-show="share_settings.linkSharing.settings.type == \'date\'">Share until date <span datetime-picker ng-model="share_settings.linkSharing.settings.value" class="link" future-only ng-show="!share_settings.linkSharing.settings.value" close-on-select="false">No expire date set</span></div><div ng-show="share_settings.linkSharing.settings.type == \'view_amount\'">Share until views <input type="number" ng-model="share_settings.linkSharing.settings.value"></div></div></div>');
+    '<div class="row"><div class="col-xs-12 col-md-6"><input type="checkbox" ng-model="share_settings.linkSharing.enabled"> Enable link sharing.<br><input type="text" ng-model="share_link" select-on-click ng-if="share_settings.linkSharing.enabled"><div>Expire settings:<select ng-model="share_settings.linkSharing.settings.type"><option value="null">Does not expire</option><option value="view_amount">Expire after a certain amount of views</option><option value="date">Expire after a date</option></select></div><div ng-show="share_settings.linkSharing.settings.type == \'date\'">Share until date <span datetime-picker ng-model="share_settings.linkSharing.settings.value" class="link" future-only ng-show="!share_settings.linkSharing.settings.value" close-on-select="false">No expire date set</span></div><div ng-show="share_settings.linkSharing.settings.type == \'view_amount\'">Share until views <input type="number" ng-model="share_settings.linkSharing.settings.value"></div></div></div>');
 }]);
 
 angular.module('views/partials/password-meter.html', []).run(['$templateCache', function($templateCache) {
diff --git a/templates/views/partials/forms/share_credential/expire_settings.html b/templates/views/partials/forms/share_credential/expire_settings.html
index 52c57bda..e00945bd 100644
--- a/templates/views/partials/forms/share_credential/expire_settings.html
+++ b/templates/views/partials/forms/share_credential/expire_settings.html
@@ -1,7 +1,8 @@
 <div class="row">
 	<div class="col-xs-12 col-md-6">
 		<input type="checkbox" ng-model="share_settings.linkSharing.enabled">
-		Enable link sharing.
+		Enable link sharing.<br />
+		<input type="text" ng-model="share_link" select-on-click ng-if="share_settings.linkSharing.enabled">
 		<div>
 			Expire settings:
 			<select ng-model="share_settings.linkSharing.settings.type">