diff --git a/js/admin/signaling-server.js b/js/admin/signaling-server.js
index 284d5d9f7e5..fa5de3fb7bc 100644
--- a/js/admin/signaling-server.js
+++ b/js/admin/signaling-server.js
@@ -8,7 +8,7 @@
 	OCA.VideoCalls.Admin.SignalingServer = {
 
 		TEMPLATE: '<div class="signaling-server">' +
-		'	<input type="text" class="server" placeholder="wss://signaling.example.org" value="{{server}}">' +
+		'	<input type="text" class="server" placeholder="wss://signaling.example.org" value="{{server}}" aria-label="' + t('spreed', 'Signaling server URL') + '">' +
 		'	<input type="checkbox" id="verify{{seed}}" name="verify{{seed}}" class="checkbox verify" value="1" {{#if verify}} checked="checked"{{/if}}>' +
 		'	<label for="verify{{seed}}">' + t('spreed', 'Validate SSL certificate') + '</label>' +
 		'	<a class="icon icon-delete" title="' + t('spreed', 'Delete server') + '"></a>' +
@@ -49,7 +49,7 @@
 				this.addNewTemplate();
 			}
 
-			this.$secret.parents('p').first().removeClass('hidden');
+			this.$secret.parents('.signaling-secret').first().removeClass('hidden');
 		},
 
 		addNewTemplate: function() {
diff --git a/js/admin/stun-server.js b/js/admin/stun-server.js
index 4132e6081f3..b5794d3cffd 100644
--- a/js/admin/stun-server.js
+++ b/js/admin/stun-server.js
@@ -8,7 +8,7 @@
 	OCA.VideoCalls.Admin.StunServer = {
 
 		TEMPLATE: '<div class="stun-server">' +
-		'	<input type="text" name="stun_server" placeholder="stunserver:port" value="{{server}}" />' +
+		'	<input type="text" name="stun_server" placeholder="stunserver:port" value="{{server}}" aria-label="' + t('spreed', 'STUN server URL') + '" />' +
 		'	<a class="icon icon-delete" title="' + t('spreed', 'Delete server') + '"></a>' +
 		'	<a class="icon icon-add" title="' + t('spreed', 'Add new server') + '"></a>' +
 		'	<span class="icon icon-checkmark-color hidden" title="' + t('spreed', 'Saved') + '"></span>' +
diff --git a/js/admin/turn-server.js b/js/admin/turn-server.js
index ad499228523..d8efaf143d6 100644
--- a/js/admin/turn-server.js
+++ b/js/admin/turn-server.js
@@ -8,8 +8,8 @@
 	OCA.VideoCalls.Admin.TurnServer = {
 
 		TEMPLATE: '<div class="turn-server">' +
-		'	<input type="text" class="server" placeholder="turn.example.org" value="{{server}}">' +
-		'	<input type="text" class="secret" placeholder="' + t('spreed', 'Shared secret') + '" value="{{secret}}">' +
+		'	<input type="text" class="server" placeholder="turn.example.org" value="{{server}}" aria-label="' + t('spreed', 'TURN server URL') + '">' +
+		'	<input type="text" class="secret" placeholder="' + t('spreed', 'Shared secret') + '" value="{{secret}}" aria-label="' + t('spreed', 'TURN server shared secret') + '">' +
 		'	<select class="protocols" title="' + t('spreed', 'TURN server protocols') + '">' +
 		'	{{#select protocols}}' +
 		'		<option value="udp,tcp">' + t('spreed', 'UDP and TCP') + '</option>' +