diff --git a/lib/Controller/IonosAccountsController.php b/lib/Controller/IonosAccountsController.php
index 34fde227d9..f44f4eab66 100644
--- a/lib/Controller/IonosAccountsController.php
+++ b/lib/Controller/IonosAccountsController.php
@@ -9,6 +9,7 @@
 namespace OCA\Mail\Controller;
 
 use OCA\Mail\Exception\ServiceException;
+use OCA\Mail\Http\JsonResponse as MailJsonResponse;
 use OCA\Mail\Http\TrapError;
 use OCP\AppFramework\Controller;
 use OCP\AppFramework\Http\Attribute\OpenAPI;
@@ -23,8 +24,6 @@ class IonosAccountsController extends Controller {
 	private const ERR_ALL_FIELDS_REQUIRED = 'All fields are required';
 	private const ERR_CREATE_EMAIL_FAILED = 'Failed to create email account';
 	private const ERR_IONOS_API_ERROR = 'IONOS_API_ERROR';
-	private const ERR_UNKNOWN_ERROR = 'UNKNOWN_ERROR';
-	private const ERR_GENERIC_SETUP = 'There was an error while setting up your account';
 
 	public function __construct(
 		string $appName,
@@ -58,17 +57,20 @@ public function create(string $accountName, string $emailAddress): JSONResponse
 		try {
 			$this->logger->info('Starting IONOS email account creation', [ 'emailAddress' => $emailAddress, 'accountName' => $accountName ]);
 			$mailConfig = $this->createIonosEmailAccount($accountName, $emailAddress);
-			$accountResponse = $this->createNextcloudMailAccount($accountName, $emailAddress, $mailConfig);
+
 			$this->logger->info('IONOS email account created successfully', [ 'emailAddress' => $emailAddress ]);
-			return new JSONResponse([
-				'success' => true,
-				'message' => 'Email account created successfully via IONOS',
-				'account' => $accountResponse->getData(),
-			], 201);
+			return $this->createNextcloudMailAccount($accountName, $emailAddress, $mailConfig);
 		} catch (ServiceException $e) {
-			return $this->handleServiceException($e, $emailAddress);
+
+			$data = [
+				'emailAddress' => $emailAddress,
+				'error' => self::ERR_IONOS_API_ERROR,
+			];
+			$this->logger->error('IONOS service error: ' . $e->getMessage(), $data);
+
+			return MailJsonResponse::fail($data);
 		} catch (\Exception $e) {
-			return $this->handleGenericException($e, $emailAddress);
+			return MailJsonResponse::error('Could not create account');
 		}
 	}
 
@@ -76,7 +78,7 @@ public function create(string $accountName, string $emailAddress): JSONResponse
 	 * @throws ServiceException
 	 */
 	private function createIonosEmailAccount(string $accountName, string $emailAddress): array {
-		$ionosResponse = $this->callIonosCreateEmailAPI($accountName, $emailAddress);
+		$ionosResponse = $this->callIonosCreateEmailAPI($emailAddress);
 		if ($ionosResponse === null || !($ionosResponse['success'] ?? false)) {
 			$this->logger->error('Failed to create IONOS email account', [ 'emailAddress' => $emailAddress, 'response' => $ionosResponse ]);
 			throw new ServiceException(self::ERR_CREATE_EMAIL_FAILED);
@@ -89,18 +91,10 @@ private function createIonosEmailAccount(string $accountName, string $emailAddre
 		return $mailConfig;
 	}
 
-	/**
-	 * @throws ServiceException
-	 */
 	private function createNextcloudMailAccount(string $accountName, string $emailAddress, array $mailConfig): JSONResponse {
-		if (!isset($mailConfig['imap'], $mailConfig['smtp'])) {
-			throw new ServiceException('Invalid mail configuration: missing IMAP or SMTP configuration');
-		}
 		$imap = $mailConfig['imap'];
 		$smtp = $mailConfig['smtp'];
-		if (!is_array($imap) || !is_array($smtp)) {
-			throw new ServiceException('Invalid mail configuration: IMAP or SMTP configuration must be arrays');
-		}
+
 		return $this->accountsController->create(
 			$accountName,
 			$emailAddress,
@@ -117,15 +111,10 @@ private function createNextcloudMailAccount(string $accountName, string $emailAd
 		);
 	}
 
-	private function handleServiceException(ServiceException $e, string $emailAddress): JSONResponse {
-		$this->logger->error('IONOS service error', [ 'exception' => $e, 'emailAddress' => $emailAddress ]);
-		return new JSONResponse(['success' => false, 'message' => $e->getMessage(), 'error' => self::ERR_IONOS_API_ERROR], 400);
-	}
-
 	/**
 	 * @throws ServiceException
 	 */
-	protected function callIonosCreateEmailAPI(string $accountName, string $emailAddress): ?array {
+	protected function callIonosCreateEmailAPI(string $emailAddress): ?array {
 		$atPosition = strrchr($emailAddress, '@');
 		if ($atPosition === false) {
 			throw new ServiceException('Invalid email address: unable to extract domain');
@@ -143,21 +132,16 @@ protected function callIonosCreateEmailAPI(string $accountName, string $emailAdd
 					'password' => 'tmp',
 					'port' => 1143, // 993,
 					'security' => 'none',
-					'username' => 'admin@strado.de' // $emailAddress,
+					'username' => $emailAddress,
 				],
 				'smtp' => [
 					'host' => 'mail.localhost', // 'smtp.' . $domain,
 					'password' => 'tmp',
 					'port' => 1587, // 465,
 					'security' => 'none',
-					'username' => 'admin@strado.de' // $emailAddress,
+					'username' => $emailAddress,
 				]
 			]
 		];
 	}
-
-	private function handleGenericException(\Exception $e, string $emailAddress): JSONResponse {
-		$this->logger->error('Unexpected error during IONOS account creation', [ 'exception' => $e, 'emailAddress' => $emailAddress ]);
-		return new JSONResponse(['success' => false, 'message' => self::ERR_GENERIC_SETUP, 'error' => self::ERR_UNKNOWN_ERROR], 500);
-	}
 }
diff --git a/lib/Controller/PageController.php b/lib/Controller/PageController.php
index 4bc43085ce..df82aafb34 100644
--- a/lib/Controller/PageController.php
+++ b/lib/Controller/PageController.php
@@ -210,6 +210,7 @@ public function index(): TemplateResponse {
 		$response = new TemplateResponse($this->appName, 'index');
 		$this->initialStateService->provideInitialState('preferences', [
 			'attachment-size-limit' => $this->config->getSystemValue('app.mail.attachment-size-limit', 0),
+			'ionos-mailconfig-enabled' => $this->config->getAppValue('mail', 'ionos-mailconfig-enabled', 'no') === 'yes',
 			'app-version' => $this->config->getAppValue('mail', 'installed_version'),
 			'external-avatars' => $this->preferences->getPreference($this->currentUserId, 'external-avatars', 'true'),
 			'layout-mode' => $this->preferences->getPreference($this->currentUserId, 'layout-mode', 'vertical-split'),
diff --git a/src/components/AccountForm.vue b/src/components/AccountForm.vue
index f5a775eb49..946bf0501c 100644
--- a/src/components/AccountForm.vue
+++ b/src/components/AccountForm.vue
@@ -199,10 +199,14 @@
 					required
 					@change="clearFeedback" />
 			</Tab>
-			<Tab id="create" key="create" :name="t('mail', 'New Email Address')">
+			<Tab v-if="useIonosMailconfig"
+				id="create"
+				key="create"
+				:name="t('mail', 'New Email Address')">
 				<NewEmailAddressTab :loading="loading"
 					:clear-feedback="clearFeedback"
-					:is-valid-email="isValidEmail" />
+					:is-valid-email="isValidEmail"
+					@account-created="(account) => $emit('account-created', account)" />
 			</Tab>
 		</Tabs>
 		<div v-if="isGoogleAccount && !googleOauthUrl" class="account-form__google-sso">
@@ -328,6 +332,10 @@ export default {
 			'microsoftOauthUrl',
 		]),
 
+		useIonosMailconfig() {
+			return this.mainStore.getPreference('ionos-mailconfig-enabled', null)
+		},
+
 		settingsPage() {
 			return this.account !== undefined
 		},
@@ -416,6 +424,12 @@ export default {
 					this.manualConfig.smtpPassword = this.autoConfig.password
 				}
 			}
+			if (this.mode === 'create') {
+				// cleanup host info in order to remove isGoogleAccount message from interface
+				this.manualConfig.imapHost = undefined
+				this.manualConfig.smtpHost = undefined
+				this.clearFeedback()
+			}
 		},
 		onImapSslModeChange(value) {
 			this.clearFeedback()
diff --git a/src/components/ionos/NewEmailAddressTab.vue b/src/components/ionos/NewEmailAddressTab.vue
index d0c2c9f3b3..f9076af226 100644
--- a/src/components/ionos/NewEmailAddressTab.vue
+++ b/src/components/ionos/NewEmailAddressTab.vue
@@ -10,6 +10,7 @@
 			type="text"
 			:placeholder="t('mail', 'Name')"
 			:disabled="loading || localLoading"
+			@change="clearAllFeedback"
 			autofocus />
 		<NcInputField id="ionos-email-address"
 			v-model="emailAddress"
@@ -18,18 +19,11 @@
 			:placeholder="t('mail', 'Mail address')"
 			:disabled="loading || localLoading"
 			required
-			@change="clearFeedback" />
+			@change="clearAllFeedback" />
 		<p v-if="emailAddress && !isValidEmail(emailAddress)" class="account-form--error">
 			{{ t('mail', 'Please enter an email of the format name@example.com') }}
 		</p>
 		<span class="email-domain-hint">@myworkspace.com</span>
-		<NcPasswordField id="ionos-password"
-			v-model="password"
-			:disabled="loading || localLoading"
-			type="password"
-			:label="t('mail', 'Password')"
-			:placeholder="t('mail', 'Password')"
-			required />
 		<div class="account-form__submit-buttons">
 			<NcButton class="account-form__submit-button"
 				type="primary"
@@ -49,16 +43,20 @@
 </template>
 
 <script>
-import { NcInputField, NcPasswordField, NcButton, NcLoadingIcon as IconLoading } from '@nextcloud/vue'
+import { NcInputField, NcButton, NcLoadingIcon as IconLoading } from '@nextcloud/vue'
 import IconCheck from 'vue-material-design-icons/Check.vue'
 import { generateUrl } from '@nextcloud/router'
 import axios from '@nextcloud/axios'
+import { translate as t } from '@nextcloud/l10n'
+import logger from '../../logger.js'
+import { fixAccountId } from '../../service/AccountService.js'
+import { mapStores } from 'pinia'
+import useMainStore from '../../store/mainStore.js'
 
 export default {
 	name: 'NewEmailAddressTab',
 	components: {
 		NcInputField,
-		NcPasswordField,
 		NcButton,
 		IconLoading,
 		IconCheck,
@@ -81,61 +79,78 @@ export default {
 		return {
 			accountName: '',
 			emailAddress: '',
-			password: '',
 			localLoading: false,
 			feedback: null,
 		}
 	},
 	computed: {
+		...mapStores(useMainStore),
 		isFormValid() {
 			return this.accountName
 				&& this.isValidEmail(this.emailAddress)
-				&& this.password
 		},
 
 		buttonText() {
 			return this.localLoading
-				? this.t('mail', 'Creating account...')
-				: this.t('mail', 'Create & Connect')
+				? t('mail', 'Creating account...')
+				: t('mail', 'Create & Connect')
 		},
 	},
 	methods: {
 		async submitForm() {
-			this.clearLocalFeedback()
-			this.clearFeedback()
+			this.clearAllFeedback()
 			this.localLoading = true
 
 			try {
-				const response = await this.callIonosAPI({
+				const account = await this.callIonosAPI({
 					accountName: this.accountName,
 					emailAddress: this.emailAddress,
-					password: this.password,
 				})
 
-				this.feedback = response.data.message || this.t('mail', 'Account created successfully')
+				logger.debug(`account ${account.id} created`, { account })
 
+				this.feedback = t('mail', 'Account created successfully')
+
+				this.loadingMessage = t('mail', 'Loading account')
+				await this.mainStore.finishAccountSetup({ account })
+				this.$emit('account-created', account)
 			} catch (error) {
 				console.error('Account creation failed:', error)
 
-				this.feedback = error.response?.data?.message
-					|| this.t('mail', 'There was an error while setting up your account')
+				if (error.data?.error === 'IONOS_API_ERROR') {
+					this.feedback = t('mail', 'There was an error while setting up your account')
+				} else {
+					this.feedback = t('mail', 'There was an error while setting up your account')
+				}
 			} finally {
 				this.localLoading = false
 			}
 		},
 
-		async callIonosAPI({ accountName, emailAddress, password }) {
+		async callIonosAPI({ accountName, emailAddress }) {
 			const url = generateUrl('/apps/mail/api/ionos/accounts')
-			return await axios.post(url, {
-				accountName,
-				emailAddress,
-				password,
-			})
+
+			return axios
+				.post(url, { accountName, emailAddress })
+				.then((resp) => resp.data.data)
+				.then(fixAccountId)
+				.catch((e) => {
+					if (e.response && e.response.status === 400) {
+						throw e.response.data
+					}
+
+					throw e
+				})
 		},
 
 		clearLocalFeedback() {
 			this.feedback = null
 		},
+
+		clearAllFeedback() {
+			this.clearLocalFeedback()
+			this.clearFeedback()
+		},
 	},
 }
 </script>
diff --git a/src/init.js b/src/init.js
index 60cf29fa12..d055872bc9 100644
--- a/src/init.js
+++ b/src/init.js
@@ -37,6 +37,10 @@ export default function initAfterAppCreation() {
 		key: 'version',
 		value: preferences['config-installed-version'],
 	})
+	mainStore.savePreferenceMutation({
+		key: 'ionos-mailconfig-enabled',
+		value: preferences['ionos-mailconfig-enabled'],
+	})
 	mainStore.savePreferenceMutation({
 		key: 'external-avatars',
 		value: preferences['external-avatars'],
diff --git a/tests/Unit/Controller/IonosAccountsControllerTest.php b/tests/Unit/Controller/IonosAccountsControllerTest.php
index 65553ae35a..1fa952e2fa 100644
--- a/tests/Unit/Controller/IonosAccountsControllerTest.php
+++ b/tests/Unit/Controller/IonosAccountsControllerTest.php
@@ -87,14 +87,14 @@ public function testCreateSuccess(): void {
 					'password' => 'tmp',
 					'port' => 1143,
 					'security' => 'none',
-					'username' => 'admin@strado.de',
+					'username' => $emailAddress, // Updated to use actual email address
 				],
 				'smtp' => [
 					'host' => 'mail.localhost',
 					'password' => 'tmp',
 					'port' => 1587,
 					'security' => 'none',
-					'username' => 'admin@strado.de',
+					'username' => $emailAddress, // Updated to use actual email address
 				]
 			]
 		]);
@@ -110,11 +110,8 @@ public function testCreateSuccess(): void {
 
 		$response = $this->controller->create($accountName, $emailAddress);
 
-		$this->assertEquals(201, $response->getStatus());
-		$data = $response->getData();
-		$this->assertTrue($data['success']);
-		$this->assertEquals('Email account created successfully via IONOS', $data['message']);
-		$this->assertEquals($accountData, $data['account']);
+		// The controller now directly returns the AccountsController response
+		$this->assertSame($accountResponse, $response);
 	}
 
 	public function testCreateWithServiceException(): void {
@@ -125,24 +122,23 @@ public function testCreateWithServiceException(): void {
 		$this->mockCallIonosCreateEmailAPI(null, new ServiceException('Failed to create email account'));
 
 		$this->logger
-			->expects($this->atLeastOnce())
+			->expects($this->once())
 			->method('error')
 			->with(
-				$this->callback(function ($message) {
-					return $message === 'IONOS service error' || $message === 'Unexpected error during IONOS account creation';
-				}),
-				$this->callback(function ($context) use ($emailAddress) {
-					return $context['emailAddress'] === $emailAddress;
-				})
+				'IONOS service error: Failed to create email account',
+				[
+					'emailAddress' => $emailAddress,
+					'error' => 'IONOS_API_ERROR',
+				]
 			);
 
+		$expectedResponse = \OCA\Mail\Http\JsonResponse::fail([
+			'emailAddress' => 'test@example.com',
+			'error' => 'IONOS_API_ERROR',
+		]);
 		$response = $this->controller->create($accountName, $emailAddress);
 
-		$this->assertEquals(400, $response->getStatus());
-		$data = $response->getData();
-		$this->assertFalse($data['success']);
-		$this->assertEquals('IONOS_API_ERROR', $data['error']);
-		$this->assertEquals('Failed to create email account', $data['message']);
+		self::assertEquals($expectedResponse, $response);
 	}
 
 	public function testCreateWithGenericException(): void {
@@ -152,32 +148,21 @@ public function testCreateWithGenericException(): void {
 		// Mock IONOS API to throw a generic exception
 		$this->mockCallIonosCreateEmailAPI(null, new \Exception('Generic error'));
 
-		$this->logger
-			->expects($this->atLeastOnce())
-			->method('error')
-			->with(
-				$this->callback(function ($message) {
-					return $message === 'IONOS service error' || $message === 'Unexpected error during IONOS account creation';
-				}),
-				$this->callback(function ($context) use ($emailAddress) {
-					return $context['emailAddress'] === $emailAddress;
-				})
-			);
-
+		$expectedResponse = \OCA\Mail\Http\JsonResponse::error('Could not create account',
+			500,
+			[],
+			0
+		);
 		$response = $this->controller->create($accountName, $emailAddress);
 
-		$this->assertEquals(500, $response->getStatus());
-		$data = $response->getData();
-		$this->assertFalse($data['success']);
-		$this->assertEquals('UNKNOWN_ERROR', $data['error']);
-		$this->assertEquals('There was an error while setting up your account', $data['message']);
+		self::assertEquals($expectedResponse, $response);
 	}
 
 	public function testCreateIonosEmailAccountSuccess(): void {
 		$accountName = 'Test Account';
 		$emailAddress = 'test@example.com';
 
-		// Mock successful IONOS API response - using actual mock data
+		// Mock successful IONOS API response - using actual mock data with correct email address
 		$mockResponse = [
 			'success' => true,
 			'mailConfig' => [
@@ -185,13 +170,13 @@ public function testCreateIonosEmailAccountSuccess(): void {
 					'host' => 'mail.localhost',
 					'port' => 1143,
 					'security' => 'none',
-					'username' => 'admin@strado.de',
+					'username' => $emailAddress, // Updated to use actual email address
 				],
 				'smtp' => [
 					'host' => 'mail.localhost',
 					'port' => 1587,
 					'security' => 'none',
-					'username' => 'admin@strado.de',
+					'username' => $emailAddress, // Updated to use actual email address
 				]
 			]
 		];
@@ -256,14 +241,14 @@ public function testCreateNextcloudMailAccount(): void {
 				'host' => 'mail.localhost',
 				'port' => 1143,
 				'security' => 'none',
-				'username' => 'admin@strado.de',
+				'username' => $emailAddress, // Updated to use actual email address
 				'password' => 'tmp'
 			],
 			'smtp' => [
 				'host' => 'mail.localhost',
 				'port' => 1587,
 				'security' => 'none',
-				'username' => 'admin@strado.de',
+				'username' => $emailAddress, // Updated to use actual email address
 				'password' => 'tmp'
 			]
 		];
@@ -279,12 +264,12 @@ public function testCreateNextcloudMailAccount(): void {
 				'mail.localhost',
 				1143,
 				'none',
-				'admin@strado.de',
+				$emailAddress, // Updated to use actual email address
 				'tmp',
 				'mail.localhost',
 				1587,
 				'none',
-				'admin@strado.de',
+				$emailAddress, // Updated to use actual email address
 				'tmp',
 			)
 			->willReturn($expectedResponse);
@@ -298,57 +283,6 @@ public function testCreateNextcloudMailAccount(): void {
 		$this->assertSame($expectedResponse, $result);
 	}
 
-	public function testHandleServiceException(): void {
-		$emailAddress = 'test@example.com';
-		$exception = new ServiceException('Test service error');
-
-		$this->logger
-			->expects($this->once())
-			->method('error')
-			->with('IONOS service error', [
-				'exception' => $exception,
-				'emailAddress' => $emailAddress
-			]);
-
-		$reflection = new ReflectionClass($this->controller);
-		$method = $reflection->getMethod('handleServiceException');
-		$method->setAccessible(true);
-
-		$result = $method->invoke($this->controller, $exception, $emailAddress);
-
-		$this->assertInstanceOf(JSONResponse::class, $result);
-		$this->assertEquals(400, $result->getStatus());
-		$data = $result->getData();
-		$this->assertFalse($data['success']);
-		$this->assertEquals('IONOS_API_ERROR', $data['error']);
-		$this->assertEquals('Test service error', $data['message']);
-	}
-
-	public function testHandleGenericException(): void {
-		$emailAddress = 'test@example.com';
-		$exception = new \Exception('Test generic error');
-
-		$this->logger
-			->expects($this->once())
-			->method('error')
-			->with('Unexpected error during IONOS account creation', [
-				'exception' => $exception,
-				'emailAddress' => $emailAddress
-			]);
-
-		$reflection = new ReflectionClass($this->controller);
-		$method = $reflection->getMethod('handleGenericException');
-		$method->setAccessible(true);
-
-		$result = $method->invoke($this->controller, $exception, $emailAddress);
-
-		$this->assertInstanceOf(JSONResponse::class, $result);
-		$this->assertEquals(500, $result->getStatus());
-		$data = $result->getData();
-		$this->assertFalse($data['success']);
-		$this->assertEquals('UNKNOWN_ERROR', $data['error']);
-		$this->assertEquals('There was an error while setting up your account', $data['message']);
-	}
 
 	public function testCallIonosCreateEmailAPIWithInvalidDomain(): void {
 		$accountName = 'Test Account';
diff --git a/tests/Unit/Controller/PageControllerTest.php b/tests/Unit/Controller/PageControllerTest.php
index c78093b324..fd7bc37923 100644
--- a/tests/Unit/Controller/PageControllerTest.php
+++ b/tests/Unit/Controller/PageControllerTest.php
@@ -262,9 +262,10 @@ public function testIndex(): void {
 				['version', '0.0.0', '26.0.0'],
 				['app.mail.attachment-size-limit', 0, 123],
 			]);
-		$this->config->expects($this->exactly(7))
+		$this->config->expects($this->exactly(8))
 			->method('getAppValue')
 			->withConsecutive(
+				[ 'mail', 'ionos-mailconfig-enabled' ],
 				[ 'mail', 'installed_version' ],
 				['mail', 'layout_message_view' ],
 				['mail', 'google_oauth_client_id' ],
@@ -273,6 +274,7 @@ public function testIndex(): void {
 				['core', 'backgroundjobs_mode', 'ajax' ],
 				['mail', 'allow_new_mail_accounts', 'yes'],
 			)->willReturnOnConsecutiveCalls(
+				$this->returnValue('no'),
 				$this->returnValue('1.2.3'),
 				$this->returnValue('threaded'),
 				$this->returnValue(''),
@@ -332,6 +334,7 @@ public function testIndex(): void {
 					'external-avatars' => 'true',
 					'reply-mode' => 'bottom',
 					'app-version' => '1.2.3',
+					'ionos-mailconfig-enabled' => false,
 					'collect-data' => 'true',
 					'start-mailbox-id' => '123',
 					'tag-classified-messages' => 'false',