diff --git a/src/bin/initialize-email-theme.ts b/src/bin/initialize-email-theme.ts
index 5f025f03..3c7861d2 100644
--- a/src/bin/initialize-email-theme.ts
+++ b/src/bin/initialize-email-theme.ts
@@ -13,8 +13,6 @@ import { getLogger } from "./tools/logger";
     const { isSilent } = getCliOptions(process.argv.slice(2));
     const logger = getLogger({ isSilent });
 
-    console.log({ keycloakThemeEmailDirPath });
-
     if (fs.existsSync(keycloakThemeEmailDirPath)) {
         logger.warn(`There is already a ${pathRelative(process.cwd(), keycloakThemeEmailDirPath)} directory in your project. Aborting.`);
 
diff --git a/src/bin/keycloakify/generateKeycloakThemeResources.ts b/src/bin/keycloakify/generateKeycloakThemeResources.ts
index adf3a8fb..5095496b 100644
--- a/src/bin/keycloakify/generateKeycloakThemeResources.ts
+++ b/src/bin/keycloakify/generateKeycloakThemeResources.ts
@@ -3,7 +3,7 @@ import * as fs from "fs";
 import { join as pathJoin, basename as pathBasename } from "path";
 import { replaceImportsFromStaticInJsCode } from "./replacers/replaceImportsFromStaticInJsCode";
 import { replaceImportsInCssCode } from "./replacers/replaceImportsInCssCode";
-import { generateFtlFilesCodeFactory, loginThemePageIds, themeTypes, ThemeType } from "./generateFtl";
+import { generateFtlFilesCodeFactory, loginThemePageIds, accountThemePageIds, themeTypes, type ThemeType } from "./generateFtl";
 import { downloadBuiltinKeycloakTheme } from "../download-builtin-keycloak-theme";
 import { mockTestingResourcesCommonPath, mockTestingResourcesPath, mockTestingSubDirOfPublicDirBasename } from "../mockTestingResourcesPath";
 import { isInside } from "../tools/isInside";
@@ -151,7 +151,24 @@ export async function generateKeycloakThemeResources(params: {
             return generateFtlFilesCode;
         })();
 
-        [...loginThemePageIds, ...(buildOptions.extraLoginPages ?? [])].forEach(pageId => {
+        [
+            ...(() => {
+                switch (themeType) {
+                    case "login":
+                        return loginThemePageIds;
+                    case "account":
+                        return accountThemePageIds;
+                }
+            })(),
+            ...((() => {
+                switch (themeType) {
+                    case "login":
+                        return buildOptions.extraLoginPages;
+                    case "account":
+                        return buildOptions.extraAccountPages;
+                }
+            })() ?? [])
+        ].forEach(pageId => {
             const { ftlCode } = generateFtlFilesCode({ pageId });
 
             fs.mkdirSync(themeDirPath, { "recursive": true });
diff --git a/test/bin/main.ts b/test/bin/main.ts
index 50161cdf..375955af 100644
--- a/test/bin/main.ts
+++ b/test/bin/main.ts
@@ -6,6 +6,8 @@ import { join as pathJoin } from "path";
 import { getProjectRoot } from "keycloakify/bin/tools/getProjectRoot.js";
 
 (async () => {
+    fs.rmSync(sampleReactProjectDirPath, { "recursive": true });
+
     await setupSampleReactProject();
 
     const binDirPath = pathJoin(getProjectRoot(), "dist_test", "src", "bin");