diff --git a/dashboard/src2/App.vue b/dashboard/src2/App.vue
index 08f22b3cf6..8eaaac2cf6 100644
--- a/dashboard/src2/App.vue
+++ b/dashboard/src2/App.vue
@@ -48,13 +48,11 @@ const route = useRoute();
 const team = getTeam();
 
 const isHideSidebar = computed(() => {
+	// return false;
 	if (!session.user) return false;
+
 	return (
-		// using window.location.pathname as router is undefined initially
-		(window.location.pathname === '/dashboard/welcome' ||
-			route.name === 'Welcome') &&
-		session.user &&
-		team?.doc?.hide_sidebar === true
+		route.meta.hideSidebar || (session.user && team?.doc?.hide_sidebar === true)
 	);
 });
 
diff --git a/dashboard/src2/components/NavigationItems.vue b/dashboard/src2/components/NavigationItems.vue
index 03055b9b4a..98c76ffc0c 100644
--- a/dashboard/src2/components/NavigationItems.vue
+++ b/dashboard/src2/components/NavigationItems.vue
@@ -92,7 +92,8 @@ export default {
 							'Deploy Candidate'
 						].includes(routeName) ||
 						routeName.startsWith('Release Group Detail'),
-					disabled: !onboardingComplete || enforce2FA
+					condition: onboardingComplete,
+					disabled: enforce2FA
 				},
 				{
 					name: 'Servers',
@@ -101,7 +102,8 @@ export default {
 					isActive:
 						['New Server'].includes(routeName) ||
 						routeName.startsWith('Server'),
-					disabled: !onboardingComplete || enforce2FA
+					condition: onboardingComplete,
+					disabled: enforce2FA
 				},
 				{
 					name: 'Marketplace',
@@ -117,6 +119,8 @@ export default {
 					name: 'Dev Tools',
 					icon: () => h(Code),
 					route: '/devtools',
+					condition: onboardingComplete,
+					disabled: enforce2FA,
 					children: [
 						{
 							name: 'SQL Playground',
diff --git a/dashboard/src2/components/OnboardingAppSelector.vue b/dashboard/src2/components/OnboardingAppSelector.vue
index 89df664881..23a041c318 100644
--- a/dashboard/src2/components/OnboardingAppSelector.vue
+++ b/dashboard/src2/components/OnboardingAppSelector.vue
@@ -3,7 +3,7 @@
 		<div
 			v-for="app in apps"
 			class="flex cursor-pointer flex-col gap-2.5 rounded-md border border-gray-300 p-4 transition duration-300 hover:border-gray-400"
-			@click.capture="() => openInstallAppPage(app.name)"
+			@click.capture="() => openInstallAppPage(app)"
 		>
 			<img :src="app.image" class="h-6 w-6" />
 			<div class="flex flex-col gap-1">
@@ -37,9 +37,45 @@ export default {
 	components: {
 		DownloadIcon
 	},
+	resources: {
+		// TODO: if only saas app use account_request
+		// TODO: handle the same for apps that aren't saas-ified (either make em all saas or handle case for it)
+		productTrialSignup() {
+			return {
+				url: 'press.api.product_trial.signup'
+
+				// onSuccess(account_request) {
+				// 	this.$router.push({
+				// 		name: 'SaaSSignupVerifyEmail',
+				// 		query: {
+				// 			email: this.email,
+				// 			account_request: account_request
+				// 		}
+				// 	});
+				// }
+			};
+		}
+	},
 	methods: {
 		openInstallAppPage(app) {
-			this.$router.push(`/install-app/${app}`);
+			this.$resources.productTrialSignup
+				.submit({
+					email: this.$team.doc.user_info.email,
+					first_name: this.$team.doc.user_info.first_name,
+					last_name: this.$team.doc.user_info.last_name,
+					country: this.$team.doc.country,
+					product: app.product_id,
+					terms_accepted: true
+				})
+				.then(account_request =>
+					this.$router.push({
+						name: 'SaaSSignupSetup',
+						params: { productId: app.product_id },
+						query: {
+							account_request: account_request
+						}
+					})
+				);
 		}
 	}
 };
diff --git a/dashboard/src2/components/auth/SaaSLoginBox.vue b/dashboard/src2/components/auth/SaaSLoginBox.vue
index 6f1346f6a2..b1b8acd334 100644
--- a/dashboard/src2/components/auth/SaaSLoginBox.vue
+++ b/dashboard/src2/components/auth/SaaSLoginBox.vue
@@ -6,7 +6,12 @@
 				class="flex flex-col items-center"
 				@dblclick="redirectForFrappeioAuth"
 			>
-				<img class="inline-block h-12 w-12 rounded-md" :src="logo" />
+				<img
+					v-if="logo"
+					class="inline-block h-12 w-12 rounded-md"
+					:src="logo"
+				/>
+				<FCLogo v-else class="inline-block h-12 w-12" />
 			</div>
 			<!-- card -->
 			<div
diff --git a/dashboard/src2/components/marketplace/ReviewMarketplaceApp.vue b/dashboard/src2/components/marketplace/ReviewMarketplaceApp.vue
deleted file mode 100644
index 607cd44d6d..0000000000
--- a/dashboard/src2/components/marketplace/ReviewMarketplaceApp.vue
+++ /dev/null
@@ -1,82 +0,0 @@
-<script setup>
-import { reactive } from 'vue';
-import { createResource } from 'frappe-ui';
-import StarRatingInput from '@/components/StarRatingInput.vue';
-import { getDocResource } from '../../utils/resource';
-import { DashboardError } from '../../utils/error';
-
-const props = defineProps({
-	marketplaceApp: String
-});
-
-const app = getDocResource({
-	doctype: 'Marketplace App',
-	name: props.marketplaceApp
-});
-
-const review = reactive({
-	app: props.marketplaceApp,
-	title: '',
-	rating: 5,
-	review: ''
-});
-
-const submitReview = createResource({
-	url: 'press.api.marketplace.submit_user_review',
-	validate() {
-		if (!review.title) {
-			throw new DashboardError('Please add a title to your review');
-		}
-
-		if (!review.review) {
-			throw new DashboardError('Review cannot be empty');
-		}
-	},
-	onSuccess() {
-		window.location.href = `/marketplace/apps/${props.marketplaceApp}`;
-	}
-});
-</script>
-
-<template>
-	<div class="mx-auto mt-12 max-w-xl px-5 text-base sm:px-8">
-		<div class="mb-4 flex items-center space-x-4">
-			<img
-				:src="app?.doc.image"
-				class="h-12 w-12 rounded-lg border"
-				:alt="app?.doc.name"
-			/>
-			<h1 class="text-xl font-semibold">{{ app?.doc.title }}</h1>
-		</div>
-
-		<div>
-			<div class="mb-3">
-				<span class="mb-2 block text-sm leading-4 text-gray-700"> Rating </span>
-				<StarRatingInput v-model="review.rating" />
-			</div>
-
-			<FormControl
-				class="mb-3"
-				v-model="review.title"
-				label="Title"
-				placeholder="Review Title"
-			/>
-
-			<FormControl
-				v-model="review.review"
-				type="textarea"
-				label="Review this product"
-				placeholder="Write Review"
-			/>
-
-			<ErrorMessage class="mt-2" :message="submitReview.error" />
-			<Button
-				class="mt-4 w-full"
-				:loading="submitReview.loading"
-				variant="solid"
-				@click="submitReview.submit({ ...review })"
-				>Submit</Button
-			>
-		</div>
-	</div>
-</template>
diff --git a/dashboard/src2/objects/common/patches.ts b/dashboard/src2/objects/common/patches.ts
index 72d30f9b72..7727b5fcec 100644
--- a/dashboard/src2/objects/common/patches.ts
+++ b/dashboard/src2/objects/common/patches.ts
@@ -47,16 +47,16 @@ export function getPatchesTab(forBench: boolean) {
 					}
 				] satisfies FilterField[],
 			columns: getPatchesTabColumns(forBench),
-			primaryAction({ listResource: apps, documentResource: releaseGroup }) {
+			primaryAction({ listResource: apps, documentResource: doc }) {
 				return {
 					label: 'Apply Patch',
 					slots: {
 						prefix: icon('plus')
 					},
 					onClick() {
-						renderDialog(
-							h(PatchAppDialog, { group: releaseGroup.name, app: '' })
-						);
+						const group = doc.doctype === 'Bench' ? doc.doc.group : doc.name;
+
+						renderDialog(h(PatchAppDialog, { group: group, app: '' }));
 					}
 				};
 			},
diff --git a/dashboard/src2/pages/InstallApp.vue b/dashboard/src2/pages/InstallApp.vue
index c8f2dc496d..f00594f726 100644
--- a/dashboard/src2/pages/InstallApp.vue
+++ b/dashboard/src2/pages/InstallApp.vue
@@ -348,6 +348,14 @@ export default {
 							params: { app: this.app },
 							query: { siteGroupDeployName: doc.name }
 						});
+					} else if (doc.doctype === 'Product Trial Request') {
+						this.$router.push({
+							name: 'SaaSSignupSetup',
+							params: { productId: doc.product_trial },
+							query: {
+								account_request: doc.account_request
+							}
+						});
 					}
 				}
 			};
diff --git a/dashboard/src2/pages/LoginSignup.vue b/dashboard/src2/pages/LoginSignup.vue
index 2d0529c01d..79c8d7ee65 100644
--- a/dashboard/src2/pages/LoginSignup.vue
+++ b/dashboard/src2/pages/LoginSignup.vue
@@ -480,7 +480,7 @@ export default {
 					onSuccess: res => {
 						let loginRoute = `/dashboard${res.dashboard_route || '/'}`;
 						if (this.$route.query.product) {
-							loginRoute = `/dashboard/app-trial/setup/${this.$route.query.product}`;
+							loginRoute = `/dashboard/start-center?product=${this.$route.query.product}`;
 						}
 						localStorage.setItem('login_email', this.email);
 						window.location.href = loginRoute;
@@ -582,7 +582,7 @@ export default {
 				return 'Sign in to your account';
 			} else {
 				if (this.saasProduct) {
-					return `Sign up to create ${this.saasProduct.title} site`;
+					return `Sign up to create a ${this.saasProduct.title} site`;
 				}
 				return 'Create a new account';
 			}
diff --git a/dashboard/src2/pages/SetupAccount.vue b/dashboard/src2/pages/SetupAccount.vue
index af517878ec..9b487a90c8 100644
--- a/dashboard/src2/pages/SetupAccount.vue
+++ b/dashboard/src2/pages/SetupAccount.vue
@@ -175,12 +175,21 @@ export default {
 					oauth_signup: this.oauthSignup,
 					oauth_domain: this.oauthDomain
 				},
-				onSuccess() {
+				onSuccess(account_request) {
 					let path = '/dashboard';
 					if (this.saasProduct) {
-						path = `/dashboard/app-trial/setup/${this.saasProduct.name}`;
+						path = `/dashboard/create-site/${this.saasProduct}/setup?account_request=${account_request}`;
 					}
 					window.location.href = path;
+					// if (this.saasProduct) {
+					// 	this.$router.push({
+					// 		name: 'SaaSSignupSetup',
+					// 		params: { productId: this.saasProduct },
+					// 		query: {
+					// 			account_request: account_request
+					// 		}
+					// 	});
+					// } else this.$router.push({ name: 'Home' });
 				}
 			};
 		}
diff --git a/dashboard/src2/pages/StartCenter.vue b/dashboard/src2/pages/StartCenter.vue
new file mode 100644
index 0000000000..9fe923d2f0
--- /dev/null
+++ b/dashboard/src2/pages/StartCenter.vue
@@ -0,0 +1,127 @@
+<template>
+	<div>
+		<div
+			class="flex h-screen w-screen items-center justify-center"
+			v-if="false"
+		>
+			<Spinner class="mr-2 w-4" />
+			<p class="text-gray-800">Loading</p>
+		</div>
+		<div class="flex h-screen overflow-hidden sm:bg-gray-50" v-else>
+			<div class="w-full overflow-auto">
+				<SaaSLoginBox
+					:title="`Hi, ${team?.doc?.user_info?.first_name}`"
+					:subtitle="['Choose a site to log in to or visit the dashboard.']"
+				>
+					<template v-slot:default>
+						<div class="space-y-4">
+							<div class="space-y-4">
+								<FormControl
+									class="w-full"
+									type="autocomplete"
+									:options="
+										(sites.data || []).map(site => ({
+											label: site.site_label || site.name,
+											value: site.name,
+											description: site.name
+										}))
+									"
+									v-model="selectedSite"
+									placeholder="Select a site"
+								/>
+								<div class="flex items-end gap-1">
+									<Button
+										class="w-full"
+										:disabled="!selectedSite"
+										@click="loginToSite"
+										icon-left="external-link"
+										label="Login to Site"
+										:loading="login.loading"
+									/>
+
+									<Button
+										class="w-full"
+										@click="
+											team.doc.onboarding.complete
+												? $router.push({
+														name: 'Site List'
+												  })
+												: $router.push({
+														name: 'Welcome'
+												  })
+										"
+										icon-left="tool"
+										label="Go to Dashboard"
+									/>
+								</div>
+							</div>
+						</div>
+					</template>
+				</SaaSLoginBox>
+			</div>
+		</div>
+	</div>
+</template>
+
+<script setup>
+import { computed, inject, ref } from 'vue';
+import { toast } from 'vue-sonner';
+import { createListResource, createResource } from 'frappe-ui';
+import SaaSLoginBox from '../components/auth/SaaSLoginBox.vue';
+import { getToastErrorMessage } from '../utils/toast';
+import { useRoute } from 'vue-router';
+
+const team = inject('team');
+const route = useRoute();
+
+const selectedSite = ref('');
+
+const login = createResource({
+	url: 'press.api.client.run_doc_method',
+	onSuccess: url => {
+		window.open(url.message, '_blank');
+	}
+});
+
+const product = route.query.product;
+const productSites = createListResource({
+	doctype: 'Site',
+	filters: { status: 'Active', standby_for_product: product },
+	fields: ['name', 'site_label'],
+	auto: !!product,
+	onSuccess: data => {
+		if (data.length === 1) {
+			selectedSite.value = {
+				value: data[0].name
+			};
+		}
+	}
+});
+
+const sites = createListResource({
+	doctype: 'Site',
+	filters: { status: 'Active', standby_for_product: ['is', 'set'] },
+	fields: ['name', 'site_label'],
+	auto: true
+});
+
+function loginToSite() {
+	if (!selectedSite) {
+		toast.error('Please select a site');
+		return;
+	}
+
+	toast.promise(
+		login.submit({
+			dt: 'Site',
+			dn: selectedSite.value.value,
+			method: 'login_as_team'
+		}),
+		{
+			loading: 'Logging in ...',
+			success: 'Logged in',
+			error: e => getToastErrorMessage(e)
+		}
+	);
+}
+</script>
diff --git a/dashboard/src2/pages/onboarding/SiteCreation.vue b/dashboard/src2/pages/onboarding/SiteCreation.vue
new file mode 100644
index 0000000000..6cb1d4d6de
--- /dev/null
+++ b/dashboard/src2/pages/onboarding/SiteCreation.vue
@@ -0,0 +1,242 @@
+<template>
+	<div class="top-0 z-10 shrink-0">
+		<Header>
+			<FBreadcrumbs
+				:items="[
+					{
+						label: 'Install App',
+						route: { name: 'InstallApp', params: { app: app } }
+					}
+				]"
+			/>
+		</Header>
+
+		<div class="m-12 mx-auto max-w-2xl px-5">
+			<div v-if="$resources.app.loading" class="py-4 text-base text-gray-600">
+				Loading...
+			</div>
+			<div v-else class="space-y-6">
+				<div class="mb-12 flex">
+					<img
+						:src="appDoc.image"
+						class="h-12 w-12 rounded-lg border"
+						:alt="appDoc.name"
+					/>
+					<div class="my-1 ml-4 flex flex-col justify-between">
+						<h1 class="text-lg font-semibold">{{ appDoc.title }}</h1>
+						<p class="text-sm text-gray-600">{{ appDoc.description }}</p>
+					</div>
+				</div>
+
+				<Progress
+					class="px-10"
+					size="lg"
+					:value="progressCount"
+					:label="currentBuildStep"
+					:hint="true"
+				/>
+
+				<div
+					v-if="failure"
+					class="flex items-center space-x-2 rounded border border-gray-200 bg-gray-100 p-4 text-base text-gray-700"
+				>
+					<i-lucide-alert-circle class="inline-block h-5 w-5" />
+					<p>Failed to create the site .</p>
+					<div class="flex h-40 flex-col items-center justify-center px-10">
+						<Button variant="outline" @click="signupForCurrentProduct"
+							>Signup for new site</Button
+						>
+						<p class="my-4 text-gray-600">or,</p>
+						<p class="text-center text-base leading-5 text-gray-800">
+							Contact at
+							<a href="mailto:support@frappe.io" class="underline"
+								>support@frappe.io</a
+							><br />
+							to resolve the issue
+						</p>
+					</div>
+				</div>
+				<!-- <div class="divide-y rounded-lg bg-gray-50 px-4">
+					<div
+						v-for="step in steps"
+						:key="step.id"
+						class="flex items-center border-gray-200 px-1 py-3"
+					>
+						<div class="flex items-center space-x-4">
+							<LoadingIndicator
+								class="h-4 w-4 text-gray-900"
+								v-if="step.icon() === 'loading'"
+							/>
+							<FeatherIcon
+								v-else
+								:name="step.icon()"
+								class="h-5 w-5 rounded-full p-0.5 text-white"
+								:stroke-width="3"
+								:class="{
+									'bg-green-500': step.icon() === 'check',
+									'bg-red-500': step.icon() === 'x',
+									'bg-gray-500': step.icon() === 'clock'
+								}"
+							/>
+							<div class="flex flex-col space-y-1">
+								<h5 class="text-base">{{ step.title }}</h5>
+							</div>
+						</div>
+					</div>
+				</div> -->
+			</div>
+		</div>
+	</div>
+</template>
+
+<script>
+import { Breadcrumbs } from 'frappe-ui';
+import Header from '../../components/Header.vue';
+
+export default {
+	props: {
+		app: {
+			type: String,
+			required: true
+		}
+	},
+	pageMeta() {
+		return {
+			title: `Install ${this.appDoc.title} - Frappe Cloud`
+		};
+	},
+	components: {
+		FBreadcrumbs: Breadcrumbs,
+		Header
+	},
+	data() {
+		return {
+			agentJobName: this.$route.query.agentJob,
+			currentBuildStep: 'Preparing to install...',
+			progressCount: 0
+		};
+	},
+	mounted() {
+		this.$socket.emit('doc_subscribe', 'Site Group Deploy', this.agentJobName);
+
+		this.$socket.on('doc_update', () => {
+			this.$resources.agentJob.reload();
+		});
+	},
+	resources: {
+		app() {
+			return {
+				url: 'press.api.marketplace.get',
+				params: {
+					app: this.app
+				},
+				auto: true
+			};
+		},
+		agentJob() {
+			return {
+				type: 'document',
+				doctype: 'Agent Job',
+				name: this.agentJobName,
+				onSuccess: doc => {
+					// check latest step and update progress
+					const steps = doc.steps;
+					const currentStep = steps[steps.length - 1];
+				}
+			};
+		}
+	},
+	computed: {
+		failure() {
+			if (!this.$resources.agentJob.doc?.steps) return false;
+
+			return this.$resources.agentJob.doc.steps.some(
+				step => step.status === 'Failed'
+			);
+		},
+		// steps() {
+		// 	const statusPosition = status => {
+		// 		if (!status) return -1;
+
+		// 		return [
+		// 			'Pending',
+		// 			'Deploying Bench',
+		// 			'Bench Deployed',
+		// 			'Bench Deploy Failed',
+		// 			'Creating Site',
+		// 			'Site Created',
+		// 			'Site Creation Failed'
+		// 		].indexOf(status);
+		// 	};
+		// 	const status = this.$resources.agentJob?.doc?.status;
+
+		// 	return [
+		// 		{
+		// 			id: 0,
+		// 			title: 'Initializing',
+		// 			description: 'Initializing the setup',
+		// 			status: 'Pending',
+		// 			icon: () => {
+		// 				if (statusPosition(status) === 0) {
+		// 					return 'loading';
+		// 				} else if (statusPosition(status) > 0) {
+		// 					return 'check';
+		// 				}
+		// 			},
+		// 			message: 'This should take a few minutes'
+		// 		},
+		// 		{
+		// 			id: 1,
+		// 			title:
+		// 				statusPosition(status) <= 1 ? 'Deploying Bench' : 'Bench Deployed',
+		// 			description: 'Deploying bench on the server',
+		// 			status: 'Deploying Bench',
+		// 			icon: () => {
+		// 				if (status === 'Bench Deploy Failed') {
+		// 					return 'x';
+		// 				} else if (statusPosition(status) === 1) {
+		// 					return 'loading';
+		// 				} else if (statusPosition(status) > 1) {
+		// 					return 'check';
+		// 				} else {
+		// 					return 'clock';
+		// 				}
+		// 			},
+		// 			message: 'This should take a few minutes'
+		// 		},
+		// 		{
+		// 			id: 2,
+		// 			title: statusPosition(status) <= 4 ? 'Creating Site' : 'Site Created',
+		// 			description: 'Creating site on the server',
+		// 			status: 'Creating Site',
+		// 			icon: () => {
+		// 				if (status === 'Site Creation Failed') {
+		// 					return 'x';
+		// 				} else if (statusPosition(status) === 4) {
+		// 					return 'loading';
+		// 				} else if (statusPosition(status) > 4) {
+		// 					return 'check';
+		// 				} else {
+		// 					return 'clock';
+		// 				}
+		// 			},
+		// 			message: 'This should take a few minutes'
+		// 		}
+		// 	];
+		// },
+		appDoc() {
+			return this.$resources.app.data || {};
+		}
+	},
+	methods: {
+		signupForCurrentProduct() {
+			this.$router.push({
+				name: 'Signup',
+				query: {
+					app: this.app
+				}
+			});
+		}
+	}
+};
+</script>
diff --git a/dashboard/src2/pages/saas/SetupSite.vue b/dashboard/src2/pages/saas/SetupSite.vue
index caaefd9034..d03b4ad315 100644
--- a/dashboard/src2/pages/saas/SetupSite.vue
+++ b/dashboard/src2/pages/saas/SetupSite.vue
@@ -124,7 +124,7 @@ export default {
 						dn: this.$resources.siteRequest.data.name,
 						method: 'create_site',
 						args: {
-							cluster: this.closestCluster,
+							cluster: this.closestCluster ?? 'Default',
 							signup_values: this.signupValues
 						}
 					};
diff --git a/dashboard/src2/router.js b/dashboard/src2/router.js
index 3113d083bd..50e9c9863f 100644
--- a/dashboard/src2/router.js
+++ b/dashboard/src2/router.js
@@ -21,7 +21,8 @@ let router = createRouter({
 		{
 			path: '/welcome',
 			name: 'Welcome',
-			component: () => import('./pages/Welcome.vue')
+			component: () => import('./pages/Welcome.vue'),
+			meta: { hideSidebar: true }
 		},
 		{
 			path: '/login',
@@ -35,6 +36,12 @@ let router = createRouter({
 			component: () => import('./pages/LoginSignup.vue'),
 			meta: { isLoginPage: true }
 		},
+		{
+			path: '/start-center',
+			name: 'Start Center',
+			component: () => import('./pages/StartCenter.vue'),
+			meta: { hideSidebar: true }
+		},
 		{
 			path: '/setup-account/:requestKey/:joinRequest?',
 			name: 'Setup Account',
@@ -206,7 +213,7 @@ let router = createRouter({
 		},
 		{
 			name: 'SaaS',
-			path: '/saas',
+			path: '/create-site',
 			redirect: { name: 'Home' },
 			children: [
 				{
@@ -272,10 +279,9 @@ let router = createRouter({
 			props: true
 		},
 		{
-			path: '/user-review/:marketplaceApp',
-			name: 'ReviewMarketplaceApp',
-			component: () =>
-				import('./components/marketplace/ReviewMarketplaceApp.vue'),
+			name: 'CreateSiteForMarketplaceAppPublic',
+			path: '/site-creation/:app',
+			component: () => import('./pages/onboarding/SiteCreation.vue'),
 			props: true
 		},
 		{
@@ -329,7 +335,7 @@ router.beforeEach(async (to, from, next) => {
 		await waitUntilTeamLoaded();
 		let $team = getTeam();
 		let onboardingComplete = $team.doc.onboarding.complete;
-		let defaultRoute = 'Site List';
+		let defaultRoute = 'Start Center';
 		let onboardingRoute = 'Welcome';
 
 		// identify user in posthog
diff --git a/press/api/account.py b/press/api/account.py
index 00930992b9..4fea44c4dc 100644
--- a/press/api/account.py
+++ b/press/api/account.py
@@ -36,7 +36,7 @@
 
 
 @frappe.whitelist(allow_guest=True)
-def signup(email, referrer=None):
+def signup(email, product=None, referrer=None):
 	frappe.utils.validate_email_address(email, True)
 
 	current_user = frappe.session.user
@@ -58,6 +58,7 @@ def signup(email, referrer=None):
 				"role": "Press Admin",
 				"referrer_id": referrer,
 				"send_email": True,
+				"product_trial": product,
 			}
 		).insert()
 
@@ -160,6 +161,8 @@ def setup_account(  # noqa: C901
 	capture("completed_signup", "fc_signup", account_request.email)
 	frappe.local.login_manager.login_as(email)
 
+	return account_request.name
+
 
 @frappe.whitelist(allow_guest=True)
 @rate_limit(limit=5, seconds=60 * 60)
@@ -321,6 +324,7 @@ def validate_request_key(key, timezone=None):
 			"oauth_domain": frappe.db.exists(
 				"OAuth Domain Mapping", {"email_domain": account_request.email.split("@")[1]}
 			),
+			"product_trial": account_request.product_trial,
 		}
 	return None
 
@@ -1084,7 +1088,7 @@ def get_user_ssh_keys():
 
 
 @frappe.whitelist(allow_guest=True)
-@rate_limit(limit=5, seconds=60 * 60)
+# @rate_limit(limit=5, seconds=60 * 60)
 def is_2fa_enabled(user):
 	return frappe.db.get_value("User 2FA", user, "enabled")
 
diff --git a/press/api/developer/saas.py b/press/api/developer/saas.py
index 60d73d0edd..57f1dec728 100644
--- a/press/api/developer/saas.py
+++ b/press/api/developer/saas.py
@@ -114,8 +114,8 @@ def get_trial_expiry(secret_key):
 
 """
 NOTE: These mentioned apis are used for all type of saas sites to allow login to frappe cloud
-- request_login_to_fc
-- validate_login_to_fc
+- send_verification_code
+- verify_verification_code
 - login_to_fc
 
 Don't change the file name or the method names
@@ -125,7 +125,7 @@ def get_trial_expiry(secret_key):
 
 @frappe.whitelist(allow_guest=True, methods=["POST"])
 @rate_limit(limit=5, seconds=60)
-def request_login_to_fc(domain: str):
+def send_verification_code(domain: str):
 	domain_info = frappe.get_value("Site Domain", domain, ["site", "status"], as_dict=True)
 	if not domain_info or domain_info.get("status") != "Active":
 		frappe.throw("The domain is not active currently. Please try again.")
@@ -184,9 +184,9 @@ def request_login_to_fc(domain: str):
 
 
 @frappe.whitelist(allow_guest=True, methods=["POST"])
-def validate_login_to_fc(domain: str, otp: str):
-	otp_hash = frappe.cache().get_value(f"otp_hash_for_fc_login_via_saas_flow:{domain}", expires=True)
-	if not otp_hash or otp_hash != frappe.utils.sha256_hash(str(otp)):
+def verify_verification_code(domain: str, verification_code: str, target: str = "start-center"):
+	otp_hash = frappe.cache.get_value(f"otp_hash_for_fc_login_via_saas_flow:{domain}", expires=True)
+	if not otp_hash or otp_hash != frappe.utils.sha256_hash(str(verification_code)):
 		frappe.throw("Invalid Code. Please try again.")
 
 	site = frappe.get_value("Site Domain", domain, "site")
@@ -194,21 +194,30 @@ def validate_login_to_fc(domain: str, otp: str):
 	user = frappe.get_value("Team", team, "user")
 
 	# as otp is valid, delete the otp from redis
-	frappe.cache().delete_value(f"otp_hash_for_fc_login_via_saas_flow:{domain}")
+	frappe.cache.delete_value(f"otp_hash_for_fc_login_via_saas_flow:{domain}")
 
 	# login and generate a login_token to store sid
 	login_token = frappe.generate_hash(length=64)
 	frappe.cache.set_value(f"saas_fc_login_token:{login_token}", user, expires_in_sec=60)
+	if target == "site-dashboard":
+		frappe.cache.set_value(f"saas_fc_login_site:{login_token}", domain, expires_in_sec=60)
 
 	frappe.response["login_token"] = login_token
 
 
 @frappe.whitelist(allow_guest=True)
 def login_to_fc(token: str):
-	cache_key = f"saas_fc_login_token:{token}"
-	email = frappe.cache().get_value(cache_key, expires=True)
+	email_cache_key = f"saas_fc_login_token:{token}"
+	domain_cache_key = f"saas_fc_login_site:{token}"
+	email = frappe.cache.get_value(email_cache_key, expires=True)
+	domain = frappe.cache.get_value(domain_cache_key, expires=True)
+
 	if email:
-		frappe.cache().delete_value(cache_key)
+		frappe.cache.delete_value(email_cache_key)
 		frappe.local.login_manager.login_as(email)
 	frappe.response.type = "redirect"
-	frappe.response.location = "/dashboard"
+	if domain:
+		frappe.cache.delete_value(domain_cache_key)
+		frappe.response.location = f"/dashboard/sites/{domain}"
+	else:
+		frappe.response.location = "/dashboard/start-center"
diff --git a/press/api/marketplace.py b/press/api/marketplace.py
index 0468895b9a..9ff3e0b14b 100644
--- a/press/api/marketplace.py
+++ b/press/api/marketplace.py
@@ -159,6 +159,73 @@ def get_install_app_options(marketplace_app: str) -> dict:
 	}
 
 
+def site_should_be_created_on_saas_bench(apps: list[dict]) -> bool:
+	"""Check if site should be created on SaaS bench"""
+
+	ProductTrial = frappe.qb.DocType("Product Trial")
+	ProductTrialApp = frappe.qb.DocType("Product Trial App")
+	saas_apps = (
+		frappe.qb.from_(ProductTrialApp)
+		.join(ProductTrial)
+		.on(ProductTrialApp.parent == ProductTrial.name)
+		.select(ProductTrialApp.app)
+		.where(ProductTrial.published == 1)
+		.run(as_dict=True, pluck="app")
+	)
+	return all(app["app"] in saas_apps for app in apps)
+
+
+def create_site_on_saas_bench(
+	subdomain: str,
+	apps: list[dict],
+	cluster: str,
+	site_plan: str,
+	latest_stable_version: str,
+	group: str | None = None,
+	trial: bool = False,
+) -> dict:
+	"""Create site on SaaS bench"""
+
+	from press.api.product_trial import _get_active_site as get_active_site_of_product_trial
+
+	ProductTrial = frappe.qb.DocType("Product Trial")
+	ProductTrialApp = frappe.qb.DocType("Product Trial App")
+	product = (
+		frappe.qb.from_(ProductTrial)
+		.join(ProductTrialApp)
+		.on(ProductTrialApp.parent == ProductTrial.name)
+		.select(ProductTrial.name)
+		.where(ProductTrial.published == 1)
+		.distinct()
+		.run(as_dict=True, pluck="app")
+	)
+	team = frappe.local.team()
+	site = get_active_site_of_product_trial(product[0], team.name)
+
+	account_request = frappe.new_doc(
+		"Account Request",
+		email=team.user,
+		team=team.name,
+	).insert(ignore_permissions=True)
+
+	if site:
+		site_request = frappe.get_doc(
+			"Product Trial Request", {"product_trial": product, "team": team, "site": site}
+		)
+	else:
+		# check if account request is valid
+		# is_valid_account_request = frappe.get_value("Account Request", account_request, "email") == team.user
+		# create a new one
+		site_request = frappe.new_doc(
+			"Product Trial Request",
+			product_trial=product[0],
+			team=team.name,
+			account_request=account_request.name,
+		).insert(ignore_permissions=True)
+
+	return site_request
+
+
 def site_should_be_created_on_public_bench(apps: list[dict]) -> bool:
 	"""Check if site should be created on public bench"""
 
@@ -317,7 +384,7 @@ def create_site_for_app(
 	subdomain: str,
 	apps: list[dict],
 	cluster: str,
-	site_plan: str,
+	site_plan: str = "$10",
 	group: str | None = None,
 	trial: bool = False,
 ):
@@ -327,6 +394,11 @@ def create_site_for_app(
 		"Frappe Version", {"status": "Stable"}, "name", order_by="number desc"
 	)
 
+	if site_should_be_created_on_saas_bench(apps):
+		return create_site_on_saas_bench(
+			subdomain, apps, cluster, site_plan, latest_stable_version, group, trial
+		)
+
 	if site_should_be_created_on_public_bench(apps):
 		return create_site_on_public_bench(
 			subdomain, apps, cluster, site_plan, latest_stable_version, group, trial
@@ -749,8 +821,28 @@ def get_marketplace_apps_for_onboarding() -> list[dict]:
 		filters={"show_for_site_creation": True, "status": "Published"},
 	)
 	total_installs_by_app = get_total_installs_by_app()
+
+	ProductTrial = frappe.qb.DocType("Product Trial")
+	ProductTrialApp = frappe.qb.DocType("Product Trial App")
+
+	product_trials = (
+		frappe.qb.from_(ProductTrial)
+		.join(ProductTrialApp)
+		.on(ProductTrial.name == ProductTrialApp.parent)
+		.select(
+			ProductTrial.name,
+			ProductTrialApp.app,
+		)
+		.where(ProductTrial.published == 1)
+		.distinct()
+		.run(as_dict=True)
+	)
+
 	for app in apps:
 		app["total_installs"] = total_installs_by_app.get(app["name"], 0)
+		app_with_product_id = find(product_trials, lambda x: x.app == app["name"])
+		app["product_id"] = app_with_product_id.name if app_with_product_id else None
+
 	# sort by total installs
 	apps = sorted(apps, key=lambda x: x["total_installs"], reverse=True)
 	return apps  # noqa: RET504
diff --git a/press/press/doctype/site/site.json b/press/press/doctype/site/site.json
index 4026cf299c..d16a88cda0 100644
--- a/press/press/doctype/site/site.json
+++ b/press/press/doctype/site/site.json
@@ -80,6 +80,7 @@
   "column_break_63",
   "hybrid_saas_pool",
   "saas_communication_secret",
+  "site_label",
   "backups_section",
   "backup_time",
   "column_break_zgig",
@@ -600,6 +601,12 @@
    "fieldname": "database_access_connection_limit",
    "fieldtype": "Int",
    "label": "Database Access Connection Limit"
+  },
+  {
+   "description": "Set for sites created through SaaS flow",
+   "fieldname": "site_label",
+   "fieldtype": "Data",
+   "label": "Site Label"
   }
  ],
  "links": [
@@ -674,7 +681,7 @@
    "link_fieldname": "site"
   }
  ],
- "modified": "2024-11-28 15:40:02.431631",
+ "modified": "2024-12-18 14:20:04.696835",
  "modified_by": "Administrator",
  "module": "Press",
  "name": "Site",
diff --git a/press/press/doctype/site/site.py b/press/press/doctype/site/site.py
index 39fd53254d..b5d4b753f4 100644
--- a/press/press/doctype/site/site.py
+++ b/press/press/doctype/site/site.py
@@ -151,6 +151,7 @@ class Site(Document, TagHelpers):
 		setup_wizard_complete: DF.Check
 		setup_wizard_status_check_next_retry_on: DF.Datetime | None
 		setup_wizard_status_check_retries: DF.Int
+		site_label: DF.Data | None
 		skip_auto_updates: DF.Check
 		skip_failing_patches: DF.Check
 		skip_scheduled_backups: DF.Check
@@ -196,6 +197,7 @@ class Site(Document, TagHelpers):
 		"host_name",
 		"skip_auto_updates",
 		"additional_system_user_created",
+		"site_label",
 	)
 
 	@staticmethod
diff --git a/press/press/doctype/team/team.py b/press/press/doctype/team/team.py
index 546d9cb06d..13617f7779 100644
--- a/press/press/doctype/team/team.py
+++ b/press/press/doctype/team/team.py
@@ -1046,13 +1046,14 @@ def get_route_on_login(self):
 			return "/sites"
 
 		if self.is_saas_user:
-			pending_site_request = self.get_pending_saas_site_request()
-			if pending_site_request:
-				product_trial = pending_site_request.product_trial
-			else:
-				product_trial = frappe.db.get_value("Account Request", self.account_request, "product_trial")
-			if product_trial:
-				return f"/app-trial/setup/{product_trial}"
+			return "/start-center"
+		# 	pending_site_request = self.get_pending_saas_site_request()
+		# 	if pending_site_request:
+		# 		product_trial = pending_site_request.product_trial
+		# 	else:
+		# 		product_trial = frappe.db.get_value("Account Request", self.account_request, "product_trial")
+		# 	if product_trial:
+		# 		return f"/app-trial/setup/{product_trial}"
 
 		return "/welcome"
 
@@ -1094,7 +1095,9 @@ def suspend_sites(self, reason=None):
 	def get_sites_to_suspend(self):
 		plan = frappe.qb.DocType("Site Plan")
 		query = (
-			frappe.qb.from_(plan).select(plan.name).where((plan.enabled == 1) & ((plan.is_frappe_plan == 1) | (plan.is_trial_plan == 1)))
+			frappe.qb.from_(plan)
+			.select(plan.name)
+			.where((plan.enabled == 1) & ((plan.is_frappe_plan == 1) | (plan.is_trial_plan == 1)))
 		).run(as_dict=True)
 		frappe_plans = [d.name for d in query]
 
diff --git a/press/saas/api/site.py b/press/saas/api/site.py
index 99ee337cfb..12abe37c83 100644
--- a/press/saas/api/site.py
+++ b/press/saas/api/site.py
@@ -12,8 +12,8 @@ def info():
 	site = frappe.get_value("Site", frappe.local.site_name, ["plan", "trial_end_date"], as_dict=True)
 	return {
 		"name": frappe.local.site_name,
-		"trial_end_date": frappe.get_value("Site", frappe.local.site_name, "trial_end_date"),
-		"plan": frappe.get_doc("Site Plan", site.plan),
+		"trial_end_date": site.trial_end_date,
+		"plan": frappe.get_doc("Site Plan", site.plan) if site.plan else None,
 	}
 
 
diff --git a/press/saas/doctype/product_trial/product_trial.py b/press/saas/doctype/product_trial/product_trial.py
index 2bb72292e8..02231c2204 100644
--- a/press/saas/doctype/product_trial/product_trial.py
+++ b/press/saas/doctype/product_trial/product_trial.py
@@ -109,7 +109,6 @@ def setup_trial_site(self, team, plan, cluster=None, account_request=None):
 		from press.press.doctype.site.site import get_plan_config
 
 		standby_site = self.get_standby_site(cluster)
-		team_record = frappe.get_doc("Team", team)
 		trial_end_date = frappe.utils.add_days(None, self.trial_days or 14)
 		site = None
 		agent_job_name = None
@@ -123,7 +122,7 @@ def setup_trial_site(self, team, plan, cluster=None, account_request=None):
 		if standby_site:
 			site = frappe.get_doc("Site", standby_site)
 			site.is_standby = False
-			site.team = team_record.name
+			site.team = team
 			site.trial_end_date = trial_end_date
 			site.account_request = account_request
 			site._update_configuration(apps_site_config, save=False)
@@ -139,6 +138,7 @@ def setup_trial_site(self, team, plan, cluster=None, account_request=None):
 			is_frappe_app_present = any(d["app"] == "frappe" for d in apps)
 			if not is_frappe_app_present:
 				apps.insert(0, {"app": "frappe"})
+			user = frappe.get_doc("User", current_user)
 			site = frappe.get_doc(
 				doctype="Site",
 				subdomain=self.get_unique_site_name(),
@@ -152,6 +152,7 @@ def setup_trial_site(self, team, plan, cluster=None, account_request=None):
 				team=team,
 				apps=apps,
 				trial_end_date=trial_end_date,
+				site_label=f"{user.first_name or user.full_name}'s {self.title} site",
 			)
 			site._update_configuration(apps_site_config, save=False)
 			site._update_configuration(get_plan_config(plan), save=False)
diff --git a/press/saas/doctype/product_trial_request/product_trial_request.py b/press/saas/doctype/product_trial_request/product_trial_request.py
index 0e9e633332..190316ec01 100644
--- a/press/saas/doctype/product_trial_request/product_trial_request.py
+++ b/press/saas/doctype/product_trial_request/product_trial_request.py
@@ -200,6 +200,9 @@ def validate_signup_fields(self):
 	def create_site(self, cluster: str | None = None, signup_values: dict | None = None):
 		if not signup_values:
 			signup_values = {}
+		if not cluster:
+			cluster = get_default_cluster()
+
 		product = frappe.get_doc("Product Trial", self.product_trial)
 		for field in product.signup_fields:
 			if field.fieldtype == "Password" and field.fieldname in signup_values:
diff --git a/press/www/saas/billing.js b/press/www/saas/billing.js
index 11b3e82401..58d63f5ef5 100644
--- a/press/www/saas/billing.js
+++ b/press/www/saas/billing.js
@@ -1,8 +1,8 @@
-const frappe_cloud_base_endpoint = 'https://frappecloud.com';
+const frappe_cloud_base_endpoint = 'https://suhaildev.tanmoysrt.xyz';
 
 function calculate_trial_end_days() {
 	// try to check for trial_end_date in frappe.boot.subscription_conf
-	if (frappe.boot.subscription_conf.trial_end_date) {
+	if (frappe.boot?.subscription_conf?.trial_end_date) {
 		const trial_end_date = new Date(
 			frappe.boot.subscription_conf.trial_end_date,
 		);
@@ -83,7 +83,7 @@ $(document).ready(function () {
 	if (frappe.boot.setup_complete === 1) {
 		if (
 			!frappe.is_mobile() &&
-			frappe.boot.subscription_conf.status !== 'Subscribed' &&
+			frappe.boot?.subscription_conf?.status !== 'Subscribed' &&
 			trial_end_days > 0
 		) {
 			$('.layout-main-section').before($floatingBar);
@@ -115,7 +115,7 @@ function showBanner() {
 	$(d.body).html(`
 		<div id="wrapper" style="position:relative">
 			<iframe
-				src="${frappe_cloud_base_endpoint}/dashboard/checkout/${frappe.boot.subscription_conf.secret_key}"
+				src="${frappe_cloud_base_endpoint}/dashboard/checkout/${frappe.boot?.subscription_conf.secret_key}"
 				style="position: relative; top: 0px; width: 100%; height: 60vh;"
 				frameborder="0"
 			>
@@ -206,7 +206,7 @@ function showFCLogindialog(email) {
 			},
 			freeze: true,
 			silent: true,
-			freeze_message: 'Validating verification code',
+			freeze_message: __('Verifying verification code...'),
 			success: function (r) {
 				if (r.login_token) {
 					fc_login_dialog.hide();