diff --git a/app/config/providers.php b/app/config/providers.php
index 66dc5780e8..65e2127b3e 100644
--- a/app/config/providers.php
+++ b/app/config/providers.php
@@ -2,6 +2,7 @@
 
 return [ // Ordered by ABC.
     'amazon' => [
+        'name' => 'Amazon',
         'developers' => 'https://developer.amazon.com/apps-and-games/services-and-apis',
         'icon' => 'icon-amazon',
         'enabled' => true,
@@ -10,6 +11,7 @@ return [ // Ordered by ABC.
         'mock' => false,
     ],
     'apple' => [
+        'name' => 'Apple',
         'developers' => 'https://developer.apple.com/',
         'icon' => 'icon-apple',
         'enabled' => true,
@@ -18,6 +20,7 @@ return [ // Ordered by ABC.
         'mock' => false,
     ],
     'bitbucket' => [
+        'name' => 'BitBucket',
         'developers' => 'https://developer.atlassian.com/bitbucket',
         'icon' => 'icon-bitbucket',
         'enabled' => true,
@@ -26,6 +29,7 @@ return [ // Ordered by ABC.
         'mock' => false,
     ],
     'bitly' => [
+        'name' => 'Bitly',
         'developers' => 'https://dev.bitly.com/v4_documentation.html',
         'icon' => 'icon-bitly',
         'enabled' => true,
@@ -34,6 +38,7 @@ return [ // Ordered by ABC.
         'mock' => false
     ],
     'box' => [
+        'name' => 'Box',
         'developers' => 'https://developer.box.com/reference/',
         'icon' => 'icon-box',
         'enabled' => true,
@@ -42,6 +47,7 @@ return [ // Ordered by ABC.
         'mock' => false
     ],
     'discord' => [
+        'name' => 'Discord',
         'developers' => 'https://discordapp.com/developers/docs/topics/oauth2',
         'icon' => 'icon-discord',
         'enabled' => true,
@@ -50,6 +56,7 @@ return [ // Ordered by ABC.
         'mock' => false,
     ],
     'dropbox' => [
+        'name' => 'Dropbox',
         'developers' => 'https://www.dropbox.com/developers/documentation',
         'icon' => 'icon-dropbox',
         'enabled' => true,
@@ -58,6 +65,7 @@ return [ // Ordered by ABC.
         'mock' => false,
     ],
     'facebook' => [
+        'name' => 'Facebook',
         'developers' => 'https://developers.facebook.com/',
         'icon' => 'icon-facebook',
         'enabled' => true,
@@ -66,6 +74,7 @@ return [ // Ordered by ABC.
         'mock' => false,
     ],
     'github' => [
+        'name' => 'GitHub',
         'developers' => 'https://developer.github.com/',
         'icon' => 'icon-github-circled',
         'enabled' => true,
@@ -74,6 +83,7 @@ return [ // Ordered by ABC.
         'mock' => false,
     ],
     'gitlab' => [
+        'name' => 'GitLab',
         'developers' => 'https://docs.gitlab.com/ee/api/',
         'icon' => 'icon-gitlab',
         'enabled' => true,
@@ -82,6 +92,7 @@ return [ // Ordered by ABC.
         'mock' => false,
     ],
     'google' => [
+        'name' => 'Google',
         'developers' => 'https://support.google.com/googleapi/answer/6158849',
         'icon' => 'icon-google',
         'enabled' => true,
@@ -90,6 +101,7 @@ return [ // Ordered by ABC.
         'mock' => false,
     ],
     'linkedin' => [
+        'name' => 'LinkedIn',
         'developers' => 'https://developer.linkedin.com/',
         'icon' => 'icon-linkedin',
         'enabled' => true,
@@ -98,6 +110,7 @@ return [ // Ordered by ABC.
         'mock' => false,
     ],
     'microsoft' => [
+        'name' => 'Microsoft',
         'developers' => 'https://developer.microsoft.com/en-us/',
         'icon' => 'icon-windows',
         'enabled' => true,
@@ -106,6 +119,7 @@ return [ // Ordered by ABC.
         'mock' => false,
     ],
     'paypal' => [
+        'name' => 'PayPal',
         'developers' => 'https://developer.paypal.com/docs/api/overview/',
         'icon' => 'icon-paypal',
         'enabled' => true,
@@ -114,14 +128,16 @@ return [ // Ordered by ABC.
         'mock' => false
     ],
     'paypalSandbox' => [
+        'name' => 'PayPal (Sandbox)',
         'developers' => 'https://developer.paypal.com/docs/api/overview/',
-        'icon' => 'icon-paypal-sandbox',
+        'icon' => 'icon-paypal',
         'enabled' => true,
         'form' => false,
         'beta' => false,
         'mock' => false
     ],
     'salesforce' => [
+        'name' => 'Salesforce',
         'developers' => 'https://developer.salesforce.com/docs/',
         'icon' => 'icon-salesforce',
         'enabled' => true,
@@ -130,6 +146,7 @@ return [ // Ordered by ABC.
         'mock' => false,
     ],
     'slack' => [
+        'name' => 'Slack',
         'developers' => 'https://api.slack.com/',
         'icon' => 'icon-slack',
         'enabled' => true,
@@ -138,6 +155,7 @@ return [ // Ordered by ABC.
         'mock' => false,
     ],
     'spotify' => [
+        'name' => 'Spotify',
         'developers' => 'https://developer.spotify.com/documentation/general/guides/authorization-guide/',
         'icon' => 'icon-spotify',
         'enabled' => true,
@@ -146,6 +164,7 @@ return [ // Ordered by ABC.
         'mock' => false,
     ],
     'twitch' => [
+        'name' => 'Twitch',
         'developers' => 'https://dev.twitch.tv/docs/authentication',
         'icon' => 'icon-twitch',
         'enabled' => true,
@@ -154,6 +173,7 @@ return [ // Ordered by ABC.
         'mock' => false,
     ],
     'vk' => [
+        'name' => 'VK',
         'developers' => 'https://vk.com/dev',
         'icon' => 'icon-vk',
         'enabled' => true,
@@ -162,6 +182,7 @@ return [ // Ordered by ABC.
         'mock' => false,
     ],
     'yahoo' => [
+        'name' => 'Yahoo',
         'developers' => 'https://developer.yahoo.com/oauth2/guide/flows_authcode/',
         'icon' => 'icon-yahoo',
         'enabled' => true,
@@ -170,6 +191,7 @@ return [ // Ordered by ABC.
         'mock' => false,
     ],
     'yandex' => [
+        'name' => 'Yandex',
         'developers' => 'https://tech.yandex.com/oauth/',
         'icon' => 'icon-yandex',
         'enabled' => true,
@@ -178,6 +200,7 @@ return [ // Ordered by ABC.
         'mock' => false,
     ],
     // 'instagram' => [
+    //     'name' => 'Instagram',
     //     'developers' => 'https://www.instagram.com/developer/',
     //     'icon' => 'icon-instagram',
     //     'enabled' => false,
@@ -185,6 +208,7 @@ return [ // Ordered by ABC.
     //     'mock' => false,
     // ],
     // 'twitter' => [
+    //     'name' => 'twitter',
     //     'developers' => 'https://developer.twitter.com/',
     //     'icon' => 'icon-twitter',
     //     'enabled' => false,
@@ -193,6 +217,7 @@ return [ // Ordered by ABC.
     // ],
     // Keep Last
     'mock' => [
+        'name' => 'Mock',
         'developers' => 'https://appwrite.io',
         'icon' => 'icon-appwrite',
         'enabled' => true,
diff --git a/app/views/console/users/index.phtml b/app/views/console/users/index.phtml
index a391f67e09..321220d0af 100644
--- a/app/views/console/users/index.phtml
+++ b/app/views/console/users/index.phtml
@@ -309,13 +309,14 @@ $providers = $this->getParam('providers', []);
                         if (isset($data['enabled']) && !$data['enabled']) { continue; }
                         if (isset($data['mock']) && $data['mock']) { continue; }
                         $form = (isset($data['form'])) ? $data['form'] : false;
+                        $name = (isset($data['name'])) ? $data['name'] : 'Unknown';
                         $beta = (isset($data['beta'])) ? $data['beta'] : false;
                         ?>
                         <li class="<?php echo (isset($data['enabled']) && !$data['enabled']) ? 'dev-feature' : ''; ?>">
                             <div data-ui-modal class="modal close" data-button-alias="none" data-open-event="provider-update-<?php echo $provider; ?>">
                                 <button type="button" class="close pull-end" data-ui-modal-close=""><i class="icon-cancel"></i></button>
 
-                                <h1><?php echo $this->escape(ucfirst($provider)); ?> OAuth2 Settings</h1>
+                                <h1><?php echo $this->escape($name); ?> OAuth2 Settings</h1>
 
                                 <form
                                     data-analytics-event="submit"
@@ -379,7 +380,7 @@ $providers = $this->getParam('providers', []);
                                 <img src="/images/oauth2/<?php echo $this->escape(strtolower($provider)); ?>.png?buster=<?php echo APP_CACHE_BUSTER; ?>" alt="<?php echo $this->escape(ucfirst($provider)); ?> Logo" class="pull-start provider margin-end" />
                                 
                                 <span class="text-size-small">
-                                    <?php echo ucfirst($provider); ?> <?php if($beta): ?>(beta)<?php endif; ?>
+                                    <?php echo $this->escape($name); ?> <?php if($beta): ?>(beta)<?php endif; ?>
                                 </span>
 
                                 <p class="margin-bottom-no text-one-liner text-size-small">