diff --git a/components/dashboard/src/start/CreateWorkspace.tsx b/components/dashboard/src/start/CreateWorkspace.tsx
index 7b870ba5248395..86b602148235e5 100644
--- a/components/dashboard/src/start/CreateWorkspace.tsx
+++ b/components/dashboard/src/start/CreateWorkspace.tsx
@@ -17,6 +17,7 @@ import { openAuthorizeWindow } from "../provider-utils";
 import { SelectAccountPayload } from "@gitpod/gitpod-protocol/lib/auth";
 import { SelectAccountModal } from "../settings/SelectAccountModal";
 import { watchHeadlessLogs } from "../components/PrebuildLogs";
+import CodeText from "../components/CodeText";
 
 const WorkspaceLogs = React.lazy(() => import('../components/WorkspaceLogs'));
 
@@ -233,9 +234,11 @@ function LimitReachedOutOfHours() {
 
 function RepositoryNotFoundView(p: { error: StartWorkspaceError }) {
   const [statusMessage, setStatusMessage] = useState<React.ReactNode>();
+  const { host, owner, repoName, userIsOwner, userScopes, lastUpdate } = p.error.data;
+  const repoFullName = (owner && repoName) ? `${owner}/${repoName}` : '';
+
   useEffect(() => {
     (async () => {
-      const { host, owner, repoName, userIsOwner, userScopes, lastUpdate } = p.error.data;
       console.log('host', host);
       console.log('owner', owner);
       console.log('repoName', repoName);
@@ -248,8 +251,6 @@ function RepositoryNotFoundView(p: { error: StartWorkspaceError }) {
         return;
       }
 
-      const repoFullName = (owner && repoName) ? `${owner}/${repoName}` : '';
-
       // TODO: this should be aware of already granted permissions
       const missingScope = authProvider.host === 'github.com' ? 'repo' : 'read_repository';
       const authorizeURL = gitpodHostUrl.withApi({
@@ -259,15 +260,15 @@ function RepositoryNotFoundView(p: { error: StartWorkspaceError }) {
 
       if (!userScopes.includes(missingScope)) {
         setStatusMessage(<div className="mt-2 flex flex-col space-y-8">
-          <p className="text-base text-gray-400 w-96">The repository '{`${repoFullName}`}' may be private. Please authorize Gitpod to access to private repositories.</p>
-          <a className="mx-auto" href={authorizeURL}><button className="secondary">Grant Access</button></a>
+          <p className="text-base text-gray-400 w-96">The repository may be private. Please authorize Gitpod to access to private repositories.</p>
+          <a className="mx-auto" href={authorizeURL}><button>Grant Access</button></a>
         </div>);
         return;
       }
 
       if (userIsOwner) {
         setStatusMessage(<div className="mt-2 flex flex-col space-y-8">
-          <p className="text-base text-gray-400 w-96">The repository '{`${repoFullName}`}' is not found in your account.</p>
+          <p className="text-base text-gray-400 w-96">The repository was not found in your account.</p>
         </div>);
         return;
       }
@@ -284,22 +285,27 @@ function RepositoryNotFoundView(p: { error: StartWorkspaceError }) {
 
       if (!updatedRecently) {
         setStatusMessage(<div className="mt-2 flex flex-col space-y-8">
-          <p className="text-base text-gray-400 w-96">Permission to access private repositories has been granted. If you are a member of '{owner}', please try to request access for Gitpod.</p>
-          <a className="mx-auto" href={authorizeURL}><button className="secondary">Request Access for Gitpod</button></a>
+          <p className="text-base text-gray-400 w-96">Permission to access private repositories has been granted. If you are a member of <CodeText>{owner}</CodeText>, please try to request access for Gitpod.</p>
+          <a className="mx-auto" href={authorizeURL}><button>Request Access for Gitpod</button></a>
         </div>);
         return;
       }
 
       setStatusMessage(<div className="mt-2 flex flex-col space-y-8">
-        <p className="text-base text-gray-400 w-96">Your access token was updated recently. Please try again if the repository exists and Gitpod was approved for '{owner}'.</p>
-        <a className="mx-auto" href={authorizeURL}><button className="secondary">Try Again</button></a>
+        <p className="text-base text-gray-400 w-96">Your access token was updated recently. Please try again if the repository exists and Gitpod was approved for <CodeText>{owner}</CodeText>.</p>
+        <a className="mx-auto" href={authorizeURL}><button>Try Again</button></a>
       </div>);
     })();
   }, []);
 
-  return <StartPage phase={StartPhase.Checking} error={p.error}>
-    {statusMessage}
-  </StartPage>;
+  return (
+    <StartPage phase={StartPhase.Checking} error={p.error}>
+      <p className="text-base text-gray-400 mt-2">
+        <CodeText>{repoFullName}</CodeText>
+      </p>
+      {statusMessage}
+    </StartPage>
+  );
 }
 
 interface RunningPrebuildViewProps {