diff --git a/webapp/packages/core-blocks/src/Button.tsx b/webapp/packages/core-blocks/src/Button.tsx
index 72930be907..489188c3dc 100644
--- a/webapp/packages/core-blocks/src/Button.tsx
+++ b/webapp/packages/core-blocks/src/Button.tsx
@@ -102,6 +102,7 @@ export const Button: React.FC<ButtonProps> = function Button({
   tag = 'button',
   disabled = false,
   loading,
+  className,
   ...rest
 }) {
   if (loading) {
@@ -110,7 +111,7 @@ export const Button: React.FC<ButtonProps> = function Button({
 
   const Button = tag;
   return styled(useStyles(buttonStyles, ...(mod || []).map(mod => buttonMod[mod])))(
-    <Button {...rest} disabled={disabled} {...use({ loading })}>
+    <Button {...rest} disabled={disabled} {...use({ loading })} className={className}>
       <ripple as="div" />
       <button-label as='div'>{children}</button-label>
       <Loader small />
diff --git a/webapp/packages/plugin-authentication/src/Dialog/AuthDialog.tsx b/webapp/packages/plugin-authentication/src/Dialog/AuthDialog.tsx
index 85ef3b6a85..ae831e8b57 100644
--- a/webapp/packages/plugin-authentication/src/Dialog/AuthDialog.tsx
+++ b/webapp/packages/plugin-authentication/src/Dialog/AuthDialog.tsx
@@ -100,6 +100,8 @@ export const AuthDialog: DialogComponent<string | null, null> = observer(functio
 
   const showTabs = !payload && controller.providers.length > 1;
 
+  const additional = userInfo.data !== null && controller.provider?.id && !userInfo.hasToken(controller.provider?.id);
+
   return styled(useStyles(styles))(
     <TabsState currentTabId={controller.provider?.id}>
       <CommonDialogWrapper
@@ -107,13 +109,14 @@ export const AuthDialog: DialogComponent<string | null, null> = observer(functio
         icon={controller.provider?.icon}
         header={(
           <>
-            {userInfo.data !== null && <auth-token-info-message as='div'>{translate('authentication_request_token')}</auth-token-info-message>}
+            {additional && <auth-token-info-message as='div'>{translate('authentication_request_token')}</auth-token-info-message>}
             {showTabs && (
               <TabList aria-label='Auth providers'>
                 {controller.providers.map(provider => (
                   <Tab
                     key={provider.id}
                     tabId={provider.id}
+                    disabled={controller.isAuthenticating}
                     onOpen={() => controller.selectProvider(provider.id)}
                   >
                     <TabTitle>{provider.label}</TabTitle>