diff --git a/apps/user_ldap/js/settings.js b/apps/user_ldap/js/settings.js
index 8c18cc4c58..87d755697c 100644
--- a/apps/user_ldap/js/settings.js
+++ b/apps/user_ldap/js/settings.js
@@ -90,7 +90,7 @@ var LdapConfiguration = {
 						);
 					}
 					$('#ldap_serverconfig_chooser option:selected').removeAttr('selected');
-					var html = '<option value="'+result.configPrefix+'" selected="selected">'+t('user_ldap','{nbServer}. Server', {nbServer: $('#ldap_serverconfig_chooser option').length})+'</option>';
+					var html = '<option value="'+result.configPrefix+'" selected="selected">'+t('user_ldap','{nthServer}. Server', {nthServer: $('#ldap_serverconfig_chooser option').length})+'</option>';
 					$('#ldap_serverconfig_chooser option:last').before(html);
 					LdapWizard.init();
 				} else {
diff --git a/apps/user_ldap/templates/part.settingcontrols.php b/apps/user_ldap/templates/part.settingcontrols.php
index dfc4954903..ddf65e8a75 100644
--- a/apps/user_ldap/templates/part.settingcontrols.php
+++ b/apps/user_ldap/templates/part.settingcontrols.php
@@ -3,7 +3,7 @@
 	<button class="ldap_action_test_connection" name="ldap_action_test_connection">
 		<?php p($l->t('Test Configuration'));?>
 	</button>
-	<a href="<?php p($theme->getDocBaseUrl()); ?>/server/7.0/admin_manual/configuration/auth_ldap.html"
+	<a href="<?php p(\OC_Helper::linkToDocs('admin-ldap')); ?>"
 		target="_blank">
 		<img src="<?php print_unescaped(OCP\Util::imagePath('', 'actions/info.png')); ?>"
 			style="height:1.75ex" />
diff --git a/apps/user_ldap/templates/part.wizardcontrols.php b/apps/user_ldap/templates/part.wizardcontrols.php
index 862e10bdd1..33e1614c9c 100644
--- a/apps/user_ldap/templates/part.wizardcontrols.php
+++ b/apps/user_ldap/templates/part.wizardcontrols.php
@@ -7,7 +7,7 @@
 	<button class="ldap_action_continue" name="ldap_action_continue" type="button">
 		<?php p($l->t('Continue'));?>
 	</button>
-	<a href="<?php p($theme->getDocBaseUrl()); ?>/server/7.0/admin_manual/configuration/auth_ldap.html"
+	<a href="<?php p(\OC_Helper::linkToDocs('admin-ldap')); ?>"
 		target="_blank">
 		<img src="<?php print_unescaped(OCP\Util::imagePath('', 'actions/info.png')); ?>"
 			style="height:1.75ex" />
diff --git a/apps/user_webdavauth/templates/settings.php b/apps/user_webdavauth/templates/settings.php
index 4596fdf3c7..a87c0ad159 100755
--- a/apps/user_webdavauth/templates/settings.php
+++ b/apps/user_webdavauth/templates/settings.php
@@ -1,7 +1,7 @@
 <form id="webdavauth" class="section" action="#" method="post">
 	<h2><?php p($l->t('WebDAV Authentication'));?></h2>
-	<p><label for="webdav_url"><?php p($l->t('Address: '));?><input type="url" placeholder="https://example.com/webdav" id="webdav_url" name="webdav_url" value="<?php p($_['webdav_url']); ?>"></label>
+	<p><label for="webdav_url"><?php p($l->t('Address:').' ');?><input type="url" placeholder="https://example.com/webdav" id="webdav_url" name="webdav_url" value="<?php p($_['webdav_url']); ?>"></label>
 	 <input type="hidden" name="requesttoken" value="<?php p($_['requesttoken']) ?>" id="requesttoken">
-	<input type="submit" value="Save" />
+	<input type="submit" value="<?php p($l->t('Save')); ?>" />
 	<br /><?php p($l->t('The user credentials will be sent to this address. This plugin checks the response and will interpret the HTTP statuscodes 401 and 403 as invalid credentials, and all other responses as valid credentials.')); ?>
 </form>