diff --git a/src/routes/CreateNewTeam/components/SearchContainer/index.jsx b/src/routes/CreateNewTeam/components/SearchContainer/index.jsx
index 094bd141..a79c5bbc 100644
--- a/src/routes/CreateNewTeam/components/SearchContainer/index.jsx
+++ b/src/routes/CreateNewTeam/components/SearchContainer/index.jsx
@@ -54,7 +54,7 @@ function SearchContainer({
           isDisabled={
             isCompletenessDisabled ||
             searchState === "searching" ||
-            (searchState === "done" && isCustomRole(matchingRole))
+            (searchState === "done" && (!addedRoles || !addedRoles.length))
           }
           onClick={searchState ? onSubmit : onClick ? onClick : search}
           extraStyleName={completenessStyle}
diff --git a/src/routes/CreateNewTeam/components/SubmitContainer/index.jsx b/src/routes/CreateNewTeam/components/SubmitContainer/index.jsx
index b6e19b77..aacd05e4 100644
--- a/src/routes/CreateNewTeam/components/SubmitContainer/index.jsx
+++ b/src/routes/CreateNewTeam/components/SubmitContainer/index.jsx
@@ -23,7 +23,7 @@ import TeamDetailsModal from "../TeamDetailsModal";
 import ConfirmationModal from "../ConfirmationModal";
 import withAuthentication from "../../../../hoc/withAuthentication";
 import "./styles.module.scss";
-import { setCurrentStage } from "utils/helpers";
+import { isCustomRole, setCurrentStage } from "utils/helpers";
 import { clearSearchedRoles } from "../../actions";
 import { postTeamRequest } from "services/teams";
 import SuccessCard from "../SuccessCard";
@@ -106,7 +106,11 @@ function SubmitContainer({
 
   return (
     <div styleName="page">
-      {matchingRole ? <ResultCard role={matchingRole} /> : <SuccessCard />}
+      {!isCustomRole(matchingRole) ? (
+        <ResultCard role={matchingRole} />
+      ) : (
+        <SuccessCard />
+      )}
       <div styleName="right-side">
         <AddedRolesAccordion addedRoles={addedRoles} />
         <Completeness