diff --git a/js/app/directives/credentialfield.js b/js/app/directives/credentialfield.js
index feb54fd0..1812c64b 100644
--- a/js/app/directives/credentialfield.js
+++ b/js/app/directives/credentialfield.js
@@ -50,11 +50,12 @@
 				'</div>' +
 				'<div class="tools">' +
 				'<div class="cell" ng-if="toggle" tooltip="tggltxt" ng-click="toggleVisibility()"><i class="fa" ng-class="{\'fa-eye\': !valueVisible, \'fa-eye-slash\': valueVisible }"></i></div>' +
-				'<div class="cell" ng-if="isLink"><a ng-href="//{{value}}" target="_blank" rel="nofollow noopener noreferrer"><i tooltip="\'Open in new window\'" class="link fa fa-external-link"></i></a></div>' +
-                		'<div class="cell" ngclipboard-success="onSuccess(e);" ngclipboard-error="onError(e);" ngclipboard data-clipboard-text="{{value}}"><i tooltip="copy_msg" class="fa fa-files-o"></i></div>' +
+				'<div class="cell" ng-if="isLink"><a ng-href="{{value}}" target="_blank" rel="nofollow noopener noreferrer"><i tooltip="\'Open in new window\'" class="link fa fa-external-link"></i></a></div>' +
+				'<div class="cell" ng-if="isPartialLink"><a ng-href="//{{value}}" target="_blank" rel="nofollow noopener noreferrer"><i tooltip="\'Open in new window\'" class="link fa fa-external-link"></i></a></div>' +
+				'<div class="cell" ngclipboard-success="onSuccess(e);" ngclipboard-error="onError(e);" ngclipboard data-clipboard-text="{{value}}"><i tooltip="copy_msg" class="fa fa-files-o"></i></div>' +
 				'</div></span>',
 				link: function (scope) {
-                    			var expression = /(https?:\/\/(?:www\.|(?!www))[^\s\.]+\.[^\s]{2,}|www\.[^\s]+\.[^\s]{2,})/gi;
+					var expression = /(https?:\/\/(?:www\.|(?!www))[^\s\.]+\.[^\s]{2,}|www\.[^\s]+\.[^\s]{2,})/gi;
 					var regex = new RegExp(expression);
 					$translate(['toggle.visibility','copy.field', 'copy', 'copied']).then(function (translations) {
 						scope.tggltxt = translations['toggle.visibility'];
@@ -68,16 +69,13 @@
 							}
 							if (regex.test(scope.value)) {
 								scope.isLink = true;
-							} else if (regex.test('http://'+scope.value) && scope.isURL){
-                                				//This part is added to check if the user did not add http or https to the url and match it nonetheless
-                                				scope.isLink = true;
 							} else {
-                                				scope.isLink = false;
-							}
-							if(scope.value.substr(0,4) !== 'http'){
-								var val = scope.value;
-								scope.value =val.substr(val.indexOf("://")+3,val.length);
+								scope.isLink = false;
+								if(regex.test('https://'+scope.value)){
+									scope.isPartialLink = true;
+								}
 							}
+
 						}
 					});
 					if (!scope.toggle) {
diff --git a/templates/views/partials/credential_template.html b/templates/views/partials/credential_template.html
index 4defeb17..5f7c4ac5 100644
--- a/templates/views/partials/credential_template.html
+++ b/templates/views/partials/credential_template.html
@@ -1,47 +1,53 @@
 <div class="credential-data">
 	<div class="row" ng-show="credential.label && showLabel">
 		<div class="col-xs-4 col-md-3 col-lg-3">{{ 'label' | translate }}</div>
-		<div class="col-xs-8 col-md-9 col-lg-9"><span credential-field
-													  value="credential.label"></span></div>
+		<div class="col-xs-8 col-md-9 col-lg-9">
+			<span credential-field value="credential.label"></span>
+		</div>
 	</div>
 
 	<div class="row" ng-show="credential.username">
 		<div class="col-xs-4 col-md-3 col-lg-3">{{ 'account' | translate }}</div>
-		<div class="col-xs-8 col-md-9 col-lg-9"><span credential-field
-													  value="credential.username"></span></div>
+		<div class="col-xs-8 col-md-9 col-lg-9">
+			<span credential-field value="credential.username"></span>
+		</div>
 	</div>
 
 
 	<div class="row" ng-show="credential.password">
 		<div class="col-xs-4 col-md-3 col-lg-3">{{ 'password' | translate }}</div>
 		<div class="col-xs-8 col-md-9 col-lg-9">
-					<span credential-field value="credential.password" secret="'true'">
-
-					</span>
+			<span credential-field value="credential.password" secret="'true'"></span>
 		</div>
 	</div>
 
 	<div class="row" ng-show="credential.otp.secret">
 		<div class="col-xs-4 col-md-3 col-lg-3">{{'otp' | translate}}</div>
-		<div class="col-xs-8 col-md-9 col-lg-9"><span otp-generator
-													  secret="credential.otp.secret"></span></div>
+		<div class="col-xs-8 col-md-9 col-lg-9">
+			<span otp-generator secret="credential.otp.secret"></span>
+		</div>
 	</div>
 
 
 	<div class="row" ng-show="credential.email">
 		<div class="col-xs-4 col-md-3 col-lg-3">{{'email' | translate}}</div>
-		<div class="col-xs-8 col-md-9 col-lg-9"><span credential-field
-													  value="credential.email"></span></div>
+		<div class="col-xs-8 col-md-9 col-lg-9">
+			<span credential-field value="credential.email"></span>
+		</div>
 	</div>
 
 	<div class="row" ng-show="credential.url">
 		<div class="col-xs-4 col-md-3 col-lg-3">{{ 'url' | translate}}</div>
-		<div class="col-xs-8 col-md-9 col-lg-9"><span credential-field value="credential.url" isurl="true"></span></div>
+		<div class="col-xs-8 col-md-9 col-lg-9">
+			<span credential-field value="credential.url" isurl="true"></span>
+		</div>
 	</div>
 
 	<div class="row" ng-show="credential.description">
 		<div class="col-xs-4 col-md-3 col-lg-3">{{'notes' | translate}}</div>
-		<div class="col-xs-8 col-md-9 col-lg-9"><span credential-field value="credential.description_html"></span></div>
+		<div class="col-xs-8 col-md-9 col-lg-9">
+			<span credential-field value="credential.description_html"></span>
+		</div>
 	</div>
 
 	<div class="row" ng-show="credential.files.length > 0">