diff --git a/components/dashboard/src/App.tsx b/components/dashboard/src/App.tsx
index 14564b3a511632..80af1b8c2ed80f 100644
--- a/components/dashboard/src/App.tsx
+++ b/components/dashboard/src/App.tsx
@@ -17,7 +17,9 @@ import settingsMenu from './settings/settings-menu';
 import { User } from '@gitpod/gitpod-protocol';
 import { adminMenu } from './admin/admin-menu';
 import gitpodIcon from './icons/gitpod.svg';
+import { ErrorCodes } from '@gitpod/gitpod-protocol/lib/messaging/error';
 
+const Setup = React.lazy(() => import(/* webpackPrefetch: true */ './Setup'));
 const Workspaces = React.lazy(() => import(/* webpackPrefetch: true */ './workspaces/Workspaces'));
 const Account = React.lazy(() => import(/* webpackPrefetch: true */ './settings/Account'));
 const Notifications = React.lazy(() => import(/* webpackPrefetch: true */ './settings/Notifications'));
@@ -43,6 +45,7 @@ function App() {
 
     const [loading, setLoading] = useState<boolean>(true);
     const [isWhatsNewShown, setWhatsNewShown] = useState(false);
+    const [isSetupRequired, setSetupRequired] = useState(false);
 
     useEffect(() => {
         (async () => {
@@ -51,6 +54,11 @@ function App() {
                 setUser(usr);
             } catch (error) {
                 console.log(error);
+                if (error && "code" in error) {
+                    if (error.code === ErrorCodes.SETUP_REQUIRED) {
+                        setSetupRequired(true);
+                    }
+                }
             }
             setLoading(false);
         })();
@@ -88,10 +96,15 @@ function App() {
     }
 
     if (loading) {
-        return <Loading />
+        return (<Loading />);
+    }
+    if (isSetupRequired) {
+        return (<Suspense fallback={<Loading />}>
+            <Setup />
+        </Suspense>);
     }
     if (!user) {
-        return (<Login />)
+        return (<Login />);
     }
     if (window.location.pathname.startsWith('/blocked')) {
         return <div className="mt-48 text-center">
@@ -117,6 +130,7 @@ function App() {
         <div className="container">
             {renderMenu(user)}
             <Switch>
+                <Route path="/setup" exact component={Setup} />
                 <Route path="/workspaces" exact component={Workspaces} />
                 <Route path="/account" exact component={Account} />
                 <Route path="/integrations" exact component={Integrations} />
diff --git a/components/dashboard/src/Login.tsx b/components/dashboard/src/Login.tsx
index 0f75ba0b121caa..a8583bcdb697da 100644
--- a/components/dashboard/src/Login.tsx
+++ b/components/dashboard/src/Login.tsx
@@ -58,21 +58,17 @@ export function Login() {
                 login: true,
                 host,
                 onSuccess: () => updateUser(),
-                onError: (error) => {
-                    if (typeof error === "string") {
-                        try {
-                            const payload = JSON.parse(error);
-                            if (typeof payload === "object" && payload.error) {
-                                if (payload.error === "email_taken") {
-                                    return setErrorMessage(`Email address already exists. Log in using a different provider.`);
-                                }
-                                return setErrorMessage(payload.description ? payload.description : `Error: ${payload.error}`);
-                            }
-                        } catch (error) {
-                            console.log(error);
+                onError: (payload) => {
+                    let errorMessage: string;
+                    if (typeof payload === "string") {
+                        errorMessage = payload;
+                    } else {
+                        errorMessage = payload.description ? payload.description : `Error: ${payload.error}`;
+                        if (payload.error === "email_taken") {
+                            errorMessage = `Email address already exists. Log in using a different provider.`;
                         }
-                        setErrorMessage(error);
                     }
+                    setErrorMessage(errorMessage);
                 }
             });
         } catch (error) {
diff --git a/components/dashboard/src/Setup.tsx b/components/dashboard/src/Setup.tsx
new file mode 100644
index 00000000000000..13a8ec92dab827
--- /dev/null
+++ b/components/dashboard/src/Setup.tsx
@@ -0,0 +1,61 @@
+/**
+ * Copyright (c) 2021 Gitpod GmbH. All rights reserved.
+ * Licensed under the GNU Affero General Public License (AGPL).
+ * See License-AGPL.txt in the project root for license information.
+ */
+
+import { useEffect, useState } from "react";
+import Modal from "./components/Modal";
+import { getGitpodService, gitpodHostUrl } from "./service/service";
+import { GitIntegrationModal } from "./settings/Integrations";
+
+export default function Setup() {
+
+    const [showModal, setShowModal] = useState<boolean>(false);
+
+    useEffect(() => {
+        (async () => {
+            const dynamicAuthProviders = await getGitpodService().server.getOwnAuthProviders();
+            const previous = dynamicAuthProviders.filter(ap => ap.ownerId === "no-user")[0];
+            if (previous) {
+                await getGitpodService().server.deleteOwnAuthProvider({ id: previous.id });
+            }
+        })();
+    }, []);
+
+    const acceptAndContinue = () => {
+        setShowModal(true);
+    }
+
+    const onAuthorize = (payload?: string) => {
+        // run without await, so the integrated closing of new tab isn't blocked
+        (async () => {
+            window.location.href = gitpodHostUrl.asDashboard().toString();
+        })();
+    }
+
+    const headerText = "Configure a git integration with a GitLab or GitHub instance."
+
+    return <div>
+        {!showModal && (
+            <Modal visible={true} onClose={() => { }} closeable={false}>
+                <h3 className="pb-2">Welcome to Gitpod 🎉</h3>
+                <div className="border-t border-b border-gray-200 dark:border-gray-800 mt-2 -mx-6 px-6 py-4">
+                    <p className="pb-4 text-gray-500 text-base">To start using Gitpod, you will need to set up a git integration.</p>
+
+                    <div className="flex">
+                        <span className="text-gray-500">
+                            By using Gitpod, you agree to our <a className="underline underline-thickness-thin underline-offset-small hover:text-gray-600" target="gitpod-terms" href="https://www.gitpod.io/self-hosted-terms/">terms</a>.
+                        </span>
+                    </div>
+                </div>
+                <div className="flex justify-end mt-6">
+                    <button className={"ml-2"} onClick={() => acceptAndContinue()}>Continue</button>
+                </div>
+            </Modal>
+        )}
+        {showModal && (
+            <GitIntegrationModal mode="new" login={true} headerText={headerText} userId="no-user" onAuthorize={onAuthorize} />
+        )}
+    </div>;
+}
diff --git a/components/dashboard/src/prebuilds/InstallGitHubApp.tsx b/components/dashboard/src/prebuilds/InstallGitHubApp.tsx
index d1091b51924551..11afb5aade12c9 100644
--- a/components/dashboard/src/prebuilds/InstallGitHubApp.tsx
+++ b/components/dashboard/src/prebuilds/InstallGitHubApp.tsx
@@ -25,8 +25,14 @@ async function registerApp(installationId: string, setModal: (modal: 'done' | st
                 setModal('done');
                 result.resolve();
             },
-            onError: (error) => {
-                setModal(error);
+            onError: (payload) => {
+                let errorMessage: string;
+                if (typeof payload === "string") {
+                    errorMessage = payload;
+                } else {
+                    errorMessage = payload.description ? payload.description : `Error: ${payload.error}`;
+                }
+                setModal(errorMessage);
             }
         })
 
@@ -46,7 +52,7 @@ export default function InstallGitHubApp() {
             <div className="px-6 py-3 flex justify-between space-x-2 text-gray-400 border-t border-gray-200 dark:border-gray-800 h-96">
                 <div className="flex flex-col items-center w-96 m-auto">
                     <h3 className="text-center pb-3 text-gray-500 dark:text-gray-400">No Installation ID Found</h3>
-                    <div className="text-center pb-6 text-gray-500">Did you came here from the GitHub app's page?</div>
+                    <div className="text-center pb-6 text-gray-500">Did you come here from the GitHub app's page?</div>
                 </div>
             </div>
         </div>
diff --git a/components/dashboard/src/provider-utils.tsx b/components/dashboard/src/provider-utils.tsx
index 324d28221e573c..80fda0bb859b4e 100644
--- a/components/dashboard/src/provider-utils.tsx
+++ b/components/dashboard/src/provider-utils.tsx
@@ -41,7 +41,7 @@ interface OpenAuthorizeWindowParams {
     scopes?: string[];
     overrideScopes?: boolean;
     onSuccess?: (payload?: string) => void;
-    onError?: (error?: string) => void;
+    onError?: (error: string | { error: string, description?: string }) => void;
 }
 
 async function openAuthorizeWindow(params: OpenAuthorizeWindowParams) {
@@ -75,12 +75,21 @@ async function openAuthorizeWindow(params: OpenAuthorizeWindowParams) {
 
         if (typeof event.data === "string" && event.data.startsWith("success")) {
             killAuthWindow();
-            onSuccess && onSuccess();
+            onSuccess && onSuccess(event.data);
         }
         if (typeof event.data === "string" && event.data.startsWith("error:")) {
-            const errorAsText = atob(event.data.substring("error:".length));
+            let error: string | { error: string, description?: string } = atob(event.data.substring("error:".length));
+            try {
+                const payload = JSON.parse(error);
+                if (typeof payload === "object" && payload.error) {
+                    error = { error: payload.error, description: payload.description };
+                }
+            } catch (error) {
+                console.log(error);
+            }
+
             killAuthWindow();
-            onError && onError(errorAsText);
+            onError && onError(error);
         }
     };
     window.addEventListener("message", eventListener);
diff --git a/components/dashboard/src/settings/Integrations.tsx b/components/dashboard/src/settings/Integrations.tsx
index 416e82797f7bd3..f4fe2be3f9c5e2 100644
--- a/components/dashboard/src/settings/Integrations.tsx
+++ b/components/dashboard/src/settings/Integrations.tsx
@@ -38,7 +38,7 @@ function GitProviders() {
 
     const [authProviders, setAuthProviders] = useState<AuthProviderInfo[]>([]);
     const [allScopes, setAllScopes] = useState<Map<string, string[]>>(new Map());
-    const [diconnectModal, setDisconnectModal] = useState<{ provider: AuthProviderInfo } | undefined>(undefined);
+    const [disconnectModal, setDisconnectModal] = useState<{ provider: AuthProviderInfo } | undefined>(undefined);
     const [editModal, setEditModal] = useState<{ provider: AuthProviderInfo, prevScopes: Set<string>, nextScopes: Set<string> } | undefined>(undefined);
     const [selectAccountModal, setSelectAccountModal] = useState<SelectAccountPayload | undefined>(undefined);
 
@@ -232,18 +232,18 @@ function GitProviders() {
             <SelectAccountModal {...selectAccountModal} close={() => setSelectAccountModal(undefined)} />
         )}
 
-        {diconnectModal && (
+        {disconnectModal && (
             <Modal visible={true} onClose={() => setDisconnectModal(undefined)}>
                 <h3 className="pb-2">Disconnect Provider</h3>
                 <div className="border-t border-b border-gray-200 dark:border-gray-800 mt-2 -mx-6 px-6 py-4">
                     <p className="pb-4 text-gray-500 text-base">Are you sure you want to disconnect the following provider?</p>
                     <div className="flex flex-col rounded-xl p-3 bg-gray-100 dark:bg-gray-800">
-                        <div className="text-gray-700 text-md font-semibold">{diconnectModal.provider.authProviderType}</div>
-                        <div className="text-gray-400 text-md">{diconnectModal.provider.host}</div>
+                        <div className="text-gray-700 text-md font-semibold">{disconnectModal.provider.authProviderType}</div>
+                        <div className="text-gray-400 text-md">{disconnectModal.provider.host}</div>
                     </div>
                 </div>
                 <div className="flex justify-end mt-6">
-                    <button className={"ml-2 danger secondary"} onClick={() => disconnect(diconnectModal.provider)}>Disconnect Provider</button>
+                    <button className={"ml-2 danger secondary"} onClick={() => disconnect(disconnectModal.provider)}>Disconnect Provider</button>
                 </div>
             </Modal>
         )}
@@ -358,10 +358,10 @@ function GitIntegrations() {
     return (<div>
 
         {modal?.mode === "new" && (
-            <GitIntegrationModal mode={modal.mode} userId={user?.id || "no-user"} onClose={() => setModal(undefined)} update={updateOwnAuthProviders} />
+            <GitIntegrationModal mode={modal.mode} userId={user?.id || "no-user"} onClose={() => setModal(undefined)} onUpdate={updateOwnAuthProviders} />
         )}
         {modal?.mode === "edit" && (
-            <GitIntegrationModal mode={modal.mode} userId={user?.id || "no-user"} provider={modal.provider} onClose={() => setModal(undefined)} update={updateOwnAuthProviders} />
+            <GitIntegrationModal mode={modal.mode} userId={user?.id || "no-user"} provider={modal.provider} onClose={() => setModal(undefined)} onUpdate={updateOwnAuthProviders} />
         )}
         {modal?.mode === "delete" && (
             <Modal visible={true} onClose={() => setModal(undefined)}>
@@ -397,7 +397,7 @@ function GitIntegrations() {
             <div className="w-full flex h-80 mt-2 rounded-xl bg-gray-100 dark:bg-gray-900">
                 <div className="m-auto text-center">
                     <h3 className="self-center text-gray-500 dark:text-gray-400 mb-4">No Git Integrations</h3>
-                    <div className="text-gray-500 mb-6">In addition to the default Git Providers you can authorize<br /> with a self hosted instace of a provider.</div>
+                    <div className="text-gray-500 mb-6">In addition to the default Git Providers you can authorize<br /> with a self-hosted instace of a provider.</div>
                     <button className="self-center" onClick={() => setModal({ mode: "new" })}>New Integration</button>
                 </div>
             </div>
@@ -430,15 +430,19 @@ function GitIntegrations() {
     </div>);
 }
 
-function GitIntegrationModal(props: ({
+export function GitIntegrationModal(props: ({
     mode: "new",
 } | {
     mode: "edit",
     provider: AuthProviderEntry
 }) & {
+    login?: boolean,
+    headerText?: string,
     userId: string,
-    onClose?: () => void
-    update?: () => void
+    onClose?: () => void,
+    closeable?: boolean,
+    onUpdate?: () => void,
+    onAuthorize?: (payload?: string) => void
 }) {
 
     const callbackUrl = (host: string) => {
@@ -446,6 +450,9 @@ function GitIntegrationModal(props: ({
         return gitpodHostUrl.with({ pathname }).toString();
     }
 
+    const [mode, setMode] = useState<"new" | "edit">("new");
+    const [providerEntry, setProviderEntry] = useState<AuthProviderEntry | undefined>(undefined);
+
     const [type, setType] = useState<string>("GitLab");
     const [host, setHost] = useState<string>("gitlab.example.com");
     const [redirectURL, setRedirectURL] = useState<string>(callbackUrl("gitlab.example.com"));
@@ -456,7 +463,9 @@ function GitIntegrationModal(props: ({
     const [validationError, setValidationError] = useState<string | undefined>();
 
     useEffect(() => {
+        setMode(props.mode);
         if (props.mode === "edit") {
+            setProviderEntry(props.provider);
             setType(props.provider.type);
             setHost(props.provider.host);
             setClientId(props.provider.oauth.clientId);
@@ -466,21 +475,22 @@ function GitIntegrationModal(props: ({
     }, []);
 
     useEffect(() => {
+        setErrorMessage(undefined);
         validate();
     }, [clientId, clientSecret])
 
-    const close = () => props.onClose && props.onClose();
-    const updateList = () => props.update && props.update();
+    const onClose = () => props.onClose && props.onClose();
+    const onUpdate = () => props.onUpdate && props.onUpdate();
 
     const activate = async () => {
-        let entry = (props.mode === "new") ? {
+        let entry = (mode === "new") ? {
             host,
             type,
             clientId,
             clientSecret,
             ownerId: props.userId
         } as AuthProviderEntry.NewEntry : {
-            id: props.provider.id,
+            id: providerEntry?.id,
             ownerId: props.userId,
             clientId,
             clientSecret: clientSecret === "redacted" ? undefined : clientSecret
@@ -495,13 +505,45 @@ function GitIntegrationModal(props: ({
             // wait at least 2 seconds for the changes to be propagated before we try to use this provider.
             await new Promise(resolve => setTimeout(resolve, 2000));
 
-            updateList();
+            onUpdate();
+
+            const updateProviderEntry = async () => {
+                const provider = (await getGitpodService().server.getOwnAuthProviders()).find(ap => ap.id === newProvider.id);
+                if (provider) {
+                    setProviderEntry(provider);
+                }
+            }
 
             // just open the authorization window and do *not* await
-            openAuthorizeWindow({ host: newProvider.host, onSuccess: updateList });
+            openAuthorizeWindow({
+                login: props.login,
+                host: newProvider.host,
+                onSuccess: (payload) => {
+                    updateProviderEntry();
+                    onUpdate();
+                    props.onAuthorize && props.onAuthorize(payload);
+                },
+                onError: (payload) => {
+                    updateProviderEntry();
+                    let errorMessage: string;
+                    if (typeof payload === "string") {
+                        errorMessage = payload;
+                    } else {
+                        errorMessage = payload.description ? payload.description : `Error: ${payload.error}`;
+                    }
+                    setErrorMessage(errorMessage);
+                }
+            });
 
-            // close the modal, as the creation phase is done anyways.
-            close();
+            if (props.closeable) {
+                // close the modal, as the creation phase is done anyways.
+                onClose();
+            } else {
+                // switch mode to stay and edit this integration.
+                // this modal is expected to be closed programmatically.
+                setMode("edit");
+                setProviderEntry(newProvider);
+            }
         } catch (error) {
             console.log(error);
             setErrorMessage("message" in error ? error.message : "Failed to update Git provider");
@@ -510,7 +552,7 @@ function GitIntegrationModal(props: ({
     }
 
     const updateHostValue = (host: string) => {
-        if (props.mode === "new") {
+        if (mode === "new") {
             setHost(host);
             setRedirectURL(callbackUrl(host));
             setErrorMessage(undefined);
@@ -582,60 +624,58 @@ function GitIntegrationModal(props: ({
         }
     };
 
-    return (<Modal visible={!!props} onClose={close}>
-        <h3 className="pb-2">{props.mode === "new" ? "New Git Integration" : "Git Integration"}</h3>
+    return (<Modal visible={!!props} onClose={onClose} closeable={props.closeable}>
+        <h3 className="pb-2">{mode === "new" ? "New Git Integration" : "Git Integration"}</h3>
         <div className="space-y-4 border-t border-b border-gray-200 dark:border-gray-800 mt-2 -mx-6 px-6 py-4">
-            {props.mode === "edit" && props.provider.status === "pending" && (
+            {mode === "edit" && providerEntry?.status !== "verified" && (
                 <AlertBox>You need to activate this integration.</AlertBox>
             )}
             <div className="flex flex-col">
-                <span className="text-gray-500">Configure a git integration with a GitLab or GitHub self-hosted instance.</span>
+                <span className="text-gray-500">{props.headerText || "Configure a git integration with a GitLab or GitHub self-hosted instance."}</span>
             </div>
-            {props.mode === "new" && (
+
+            <div className="overscroll-contain max-h-96 overflow-y-auto pr-2">
+                {mode === "new" && (
+                    <div className="flex flex-col space-y-2">
+                        <label htmlFor="type" className="font-medium">Provider Type</label>
+                        <select name="type" value={type} disabled={mode !== "new"} className="w-full"
+                            onChange={(e) => setType(e.target.value)}>
+                            <option value="GitHub">GitHub</option>
+                            <option value="GitLab">GitLab</option>
+                        </select>
+                    </div>
+                )}
                 <div className="flex flex-col space-y-2">
-                    <label htmlFor="type" className="font-medium">Provider Type</label>
-                    <select name="type" value={type} disabled={props.mode !== "new"} className="w-full"
-                        onChange={(e) => setType(e.target.value)}>
-                        <option value="GitHub">GitHub</option>
-                        <option value="GitLab">GitLab</option>
-                    </select>
+                    <label htmlFor="hostName" className="font-medium">Provider Host Name</label>
+                    <input name="hostName" disabled={mode === "edit"} type="text" value={host} className="w-full"
+                        onChange={(e) => updateHostValue(e.target.value)} />
                 </div>
-            )}
-            <div className="flex flex-col space-y-2">
-                <label htmlFor="hostName" className="font-medium">Provider Host Name</label>
-                <input name="hostName" disabled={props.mode === "edit"} type="text" value={host} className="w-full"
-                    onChange={(e) => updateHostValue(e.target.value)} />
-            </div>
-            <div className="flex flex-col space-y-2">
-                <label htmlFor="redirectURL" className="font-medium">Redirect URL</label>
-                <div className="w-full relative">
-                    <input name="redirectURL" disabled={true} readOnly={true} type="text" value={redirectURL} className="w-full truncate" />
-                    <div className="cursor-pointer" onClick={() => copyRedirectUrl()}>
-                        <img src={copy} title="Copy the Redirect URL to clippboard" className="absolute top-1/3 right-3" />
+                <div className="flex flex-col space-y-2">
+                    <label htmlFor="redirectURL" className="font-medium">Redirect URL</label>
+                    <div className="w-full relative">
+                        <input name="redirectURL" disabled={true} readOnly={true} type="text" value={redirectURL} className="w-full pr-8" />
+                        <div className="cursor-pointer" onClick={() => copyRedirectUrl()}>
+                            <img src={copy} title="Copy the Redirect URL to clippboard" className="absolute top-1/3 right-3" />
+                        </div>
                     </div>
+                    <span className="text-gray-500 text-sm">{getRedirectUrlDescription(type, host)}</span>
                 </div>
-                <span className="text-gray-500 text-sm">{getRedirectUrlDescription(type, host)}</span>
-            </div>
-            <div className="flex flex-col space-y-2">
-                <label htmlFor="clientId" className="font-medium">Client ID</label>
-                <input name="clientId" type="text" value={clientId} className="w-full"
-                    onChange={(e) => updateClientId(e.target.value)} />
-            </div>
-            <div className="flex flex-col space-y-2">
-                <label htmlFor="clientSecret" className="font-medium">Client Secret</label>
-                <input name="clientSecret" type="password" value={clientSecret} className="w-full"
-                    onChange={(e) => updateClientSecret(e.target.value)} />
-            </div>
-            {errorMessage && (
-                <div className="flex rounded-md bg-red-600 p-3">
-                    <img className="w-4 h-4 mx-2 my-auto" src={exclamation} />
-                    <span className="text-white">{errorMessage}</span>
+                <div className="flex flex-col space-y-2">
+                    <label htmlFor="clientId" className="font-medium">Client ID</label>
+                    <input name="clientId" type="text" value={clientId} className="w-full"
+                        onChange={(e) => updateClientId(e.target.value)} />
                 </div>
-            )}
-            {!!validationError && (
+                <div className="flex flex-col space-y-2">
+                    <label htmlFor="clientSecret" className="font-medium">Client Secret</label>
+                    <input name="clientSecret" type="password" value={clientSecret} className="w-full"
+                        onChange={(e) => updateClientSecret(e.target.value)} />
+                </div>
+            </div>
+
+            {(errorMessage || validationError) && (
                 <div className="flex rounded-md bg-red-600 p-3">
                     <img className="w-4 h-4 mx-2 my-auto filter-brightness-10" src={exclamation} />
-                    <span className="text-white">{validationError}</span>
+                    <span className="text-white">{errorMessage || validationError}</span>
                 </div>
             )}
         </div>
diff --git a/components/server/src/workspace/gitpod-server-impl.ts b/components/server/src/workspace/gitpod-server-impl.ts
index 495f16999830ce..265a56febcd3c1 100644
--- a/components/server/src/workspace/gitpod-server-impl.ts
+++ b/components/server/src/workspace/gitpod-server-impl.ts
@@ -186,7 +186,7 @@ export class GitpodServerImpl<Client extends GitpodClient, Server extends Gitpod
     }
 
     protected checkUser(methodName?: string, logPayload?: {}): User {
-        if (this.setupRequired) {
+        if (this.showSetupCondition?.value) {
             throw new ResponseError(ErrorCodes.SETUP_REQUIRED, 'Setup required.');
         }
         if (!this.user) {
@@ -226,12 +226,19 @@ export class GitpodServerImpl<Client extends GitpodClient, Server extends Gitpod
         return this.checkUser("getLoggedInUser");
     }
 
-    protected setupRequired: boolean = false;
+    protected showSetupCondition: { value: boolean } | undefined = undefined;
     protected async doUpdateUser(): Promise<void> {
-        const hasAnyStaticProviders = this.hostContextProvider.getAll().some(hc => hc.authProvider.config.builtin === true);
-        if (!hasAnyStaticProviders) {
-            const userCount = await this.userDB.getUserCount();
-            this.setupRequired = userCount === 0;
+
+        // execute the check for the setup to be shown until the setup is not required.
+        // cf. evaluation of the condition in `checkUser`
+        if (!this.showSetupCondition || this.showSetupCondition.value === true) {
+            const hasAnyStaticProviders = this.hostContextProvider.getAll().some(hc => hc.authProvider.config.builtin === true);
+            if (!hasAnyStaticProviders) {
+                const userCount = await this.userDB.getUserCount();
+                this.showSetupCondition = { value: userCount === 0 };
+            } else {
+                this.showSetupCondition = { value: false };
+            }
         }
 
         if (this.user) {
@@ -276,6 +283,9 @@ export class GitpodServerImpl<Client extends GitpodClient, Server extends Gitpod
         const hostContexts = this.hostContextProvider.getAll();
         const authProviders = hostContexts.map(hc => hc.authProvider.info);
 
+        const isNotHidden = (info: AuthProviderInfo) => !info.hiddenOnDashboard;
+        const isVerified = (info: AuthProviderInfo) => info.verified;
+
         // if no user session is available, compute public information only
         if (!this.user) {
             const toPublic = (info: AuthProviderInfo) => <AuthProviderInfo>{
@@ -286,7 +296,7 @@ export class GitpodServerImpl<Client extends GitpodClient, Server extends Gitpod
                 icon: info.icon,
                 description: info.description
             }
-            const result = authProviders.map(toPublic);
+            const result = authProviders.filter(isNotHidden).filter(isVerified).map(toPublic);
             return result;
         }
 
@@ -298,7 +308,13 @@ export class GitpodServerImpl<Client extends GitpodClient, Server extends Gitpod
                 result.push({ ...info, isReadonly: identity.readonly });
                 continue;
             }
-            result.push(info);
+            if (info.ownerId === this.user.id) {
+                result.push(info);
+                continue;
+            }
+            if (isNotHidden(info) && isVerified(info)) {
+                result.push(info);
+            }
         }
         return result;
     }