diff --git a/css/style.scss b/css/style.scss
index 4808423875e..659fa385595 100644
--- a/css/style.scss
+++ b/css/style.scss
@@ -737,6 +737,10 @@ video {
 	background-image: url('../img/menu-people.svg?v=1');
 }
 
+.icon-no-password {
+	background-image: url('../img/no-password.svg?v=1');
+}
+
 #app-sidebar .close {
 	position: absolute;
 	top: 0;
@@ -923,11 +927,13 @@ video {
 }
 
 .detailCallInfoContainer .clipboard-button,
+.detailCallInfoContainer .password-button,
 .detailCallInfoContainer .editable-text-label:hover .edit-button {
 	display: inline-block;
 }
 
 .detailCallInfoContainer .clipboard-button .icon,
+.detailCallInfoContainer .password-button .icon,
 .detailCallInfoContainer .editable-text-label .edit-button .icon {
 	cursor: pointer;
 	padding: 22px;
diff --git a/img/no-password.svg b/img/no-password.svg
new file mode 100644
index 00000000000..981197eda76
--- /dev/null
+++ b/img/no-password.svg
@@ -0,0 +1 @@
+<svg xmlns="http://www.w3.org/2000/svg" height="16" width="16" version="1.1" viewBox="0 0 71 100"><path stroke-width=".16" d="m8 0c-2.2091 0-4 1.7909-4 4v3h-1v7h10v-7h-1-2-2-2v-3c0-1.1046 0.8954-2 2-2s2 0.8954 2 2v1h2v-1c0-2.2091-1.791-4-4-4z" transform="matrix(6.25,0,0,6.25,-14.5,0)"/></svg>
\ No newline at end of file
diff --git a/js/views/callinfoview.js b/js/views/callinfoview.js
index a8adbae136d..c4ecee50e53 100644
--- a/js/views/callinfoview.js
+++ b/js/views/callinfoview.js
@@ -51,6 +51,7 @@
 		'		<label for="link-checkbox">' + t('spreed', 'Share link') + '</label>' +
 		'		{{#if isPublic}}' +
 		'			<div class="clipboard-button"><span class="icon icon-clippy"></span></div>' +
+		'			<div class="password-button"><span class="icon {{#if hasPassword}}icon-password"{{else}}icon-no-password{{/if}}"></span></div>' +
 		'			<div class="password-option">' +
 		'				<input class="password-input" maxlength="200" type="password"' +
 		'				  placeholder="{{#if hasPassword}}' + t('spreed', 'Change password') + '{{else}}' + t('spreed', 'Set password') + '{{/if}}">'+
@@ -88,6 +89,7 @@
 			'joinCallButton': 'button.join-call',
 			'leaveCallButton': 'button.leave-call',
 
+			'passwordButton': '.password-button',
 			'passwordOption': '.password-option',
 			'passwordInput': '.password-input',
 			'passwordConfirm': '.password-confirm'
@@ -102,6 +104,7 @@
 			'change @ui.linkCheckbox': 'toggleLinkCheckbox',
 
 			'keyup @ui.passwordInput': 'keyUpPassword',
+			'click @ui.passwordButton': 'showPasswordInput',
 			'click @ui.passwordConfirm': 'confirmPassword',
 			'click @ui.joinCallButton': 'joinCall',
 			'click @ui.leaveCallButton': 'leaveCall'
@@ -210,6 +213,14 @@
 				title: t('spreed', 'Copy')
 			});
 			this.initClipboard();
+
+			this.ui.passwordOption.hide();
+			this.ui.passwordButton.tooltip({
+				placement: 'bottom',
+				trigger: 'hover',
+				title: (this.model.get('hasPassword')) ? t('spreed', 'Change password') : t('spreed', 'Set password')
+			});
+
 		},
 
 		_canModerate: function() {
@@ -265,12 +276,14 @@
 		/**
 		 * Password
 		 */
+		showPasswordInput: function() {
+			this.ui.passwordButton.hide();
+			this.ui.passwordOption.show();
+			this.ui.passwordInput.focus();
+		},
+
 		confirmPassword: function() {
 			var newPassword = this.ui.passwordInput.val().trim();
-
-			console.log('Setting room password to "' + newPassword + '".');
-			console.log('Setting room password to "' + this.model.get('hasPassword') + '".');
-
 			$.ajax({
 				url: OC.linkToOCS('apps/spreed/api/v1/room', 2) + this.model.get('token') + '/password',
 				type: 'PUT',
@@ -279,12 +292,14 @@
 				},
 				success: function() {
 					this.ui.passwordInput.val('');
-
+					this.ui.passwordOption.hide();
+					this.ui.passwordButton.show();
 					OCA.SpreedMe.app.syncRooms();
-				}.bind(this)
+				}.bind(this),
+				error: function() {
+					OC.Notification.show(t('spreed', 'Error occurred while setting password'), {type: 'error'});
+				}
 			});
-
-			console.log('.rename-option');
 		},
 
 		keyUpPassword: function(e) {
@@ -294,6 +309,8 @@
 			} else if (e.keyCode === 27) {
 				// ESC
 				this.ui.passwordInput.val('');
+				this.ui.passwordOption.hide();
+				this.ui.passwordButton.show();
 			}
 		},