diff --git a/lib/private/Authentication/Token/DefaultTokenMapper.php b/lib/private/Authentication/Token/DefaultTokenMapper.php
index 44bc553a92e..ff31628ffb0 100644
--- a/lib/private/Authentication/Token/DefaultTokenMapper.php
+++ b/lib/private/Authentication/Token/DefaultTokenMapper.php
@@ -110,7 +110,7 @@ class DefaultTokenMapper extends Mapper {
 	}
 
 	/**
-	 * Get all token of a user
+	 * Get all tokens of a user
 	 *
 	 * The provider may limit the number of result rows in case of an abuse
 	 * where a high number of (session) tokens is generated
diff --git a/lib/private/Authentication/Token/DefaultTokenProvider.php b/lib/private/Authentication/Token/DefaultTokenProvider.php
index 6fd85295e03..a1a7e83ea21 100644
--- a/lib/private/Authentication/Token/DefaultTokenProvider.php
+++ b/lib/private/Authentication/Token/DefaultTokenProvider.php
@@ -132,7 +132,7 @@ class DefaultTokenProvider implements IProvider {
 	}
 
 	/**
-	 * Get all token of a user
+	 * Get all tokens of a user
 	 *
 	 * The provider may limit the number of result rows in case of an abuse
 	 * where a high number of (session) tokens is generated
diff --git a/lib/private/Authentication/Token/IProvider.php b/lib/private/Authentication/Token/IProvider.php
index 9f280263d76..8ec1d9b8d6c 100644
--- a/lib/private/Authentication/Token/IProvider.php
+++ b/lib/private/Authentication/Token/IProvider.php
@@ -105,7 +105,7 @@ interface IProvider {
 	public function updateTokenActivity(IToken $token);
 
 	/**
-	 * Get all token of a user
+	 * Get all tokens of a user
 	 *
 	 * The provider may limit the number of result rows in case of an abuse
 	 * where a high number of (session) tokens is generated
diff --git a/settings/Controller/AuthSettingsController.php b/settings/Controller/AuthSettingsController.php
index 7bb8a6654e6..d1ce567afb9 100644
--- a/settings/Controller/AuthSettingsController.php
+++ b/settings/Controller/AuthSettingsController.php
@@ -156,7 +156,7 @@ class AuthSettingsController extends Controller {
 	/**
 	 * Return a 25 digit device password
 	 *
-	 * Example: AbCdE-fGhIj-KlMnO-pQrSt-12345
+	 * Example: AbCdE-fGhJk-MnPqR-sTwXy-23456
 	 *
 	 * @return string
 	 */