diff --git a/package.json b/package.json
index ceccdbd7..36050ee7 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "rucio-webui",
-  "version": "36.0.0",
+  "version": "36.0.1",
   "private": true,
   "scripts": {
     "clean": "rimraf .next .swc",
diff --git a/src/component-library/pages/legacy/Login/Login.tsx b/src/component-library/pages/legacy/Login/Login.tsx
index e64c3c43..d02a7cec 100644
--- a/src/component-library/pages/legacy/Login/Login.tsx
+++ b/src/component-library/pages/legacy/Login/Login.tsx
@@ -167,10 +167,9 @@ export const Login = ({
         return (
             <div
                 className={twMerge(
-                    'rounded p-4 flex flex-col justify-center space-y-2',
-                    'border dark:border-2',
-                    'border-neutral-300 dark:border-neutral-0',
-                    'bg-neutral-0 dark:bg-neutral-800',
+                    'border dark:border-2 rounded-xl p-6 flex flex-col justify-center space-y-4',
+                    'border-neutral-300 dark:border-neutral-700',
+                    'bg-neutral-50 dark:bg-neutral-900'
                 )}
                 id="root"
             >
@@ -193,7 +192,7 @@ export const Login = ({
                 </div>
 
                 <div
-                    className="flex flex-col space-y-2"
+                    className="flex flex-col space-y-4"
                     onSubmit={e => {
                         e.preventDefault();
                     }} // TODO handle proper submit!
@@ -235,11 +234,11 @@ export const Login = ({
                                 />
                                 <form>
                                     <fieldset
-                                        className={twMerge('flex flex-col space-y-2', 'mx-2 md:mx-10', showUserPassLoginForm ? '' : 'hidden')}
+                                        className={twMerge('flex flex-col space-y-4', 'mx-2 md:mx-10', showUserPassLoginForm ? '' : 'hidden')}
                                         aria-label="Userpass Login Fields"
                                         id="userpass-form"
                                     >
-                                        <div className={twMerge('flex flex-col space-y-1 p-2')}>
+                                        <div className={twMerge('flex flex-col space-y-2 p-2')}>
                                             <LabelledInput
                                                 label="Username"
                                                 idinput="username-input"
diff --git a/tools/env-generator/src/templates/.env.liquid b/tools/env-generator/src/templates/.env.liquid
index 25014bb9..a39d3ce6 100644
--- a/tools/env-generator/src/templates/.env.liquid
+++ b/tools/env-generator/src/templates/.env.liquid
@@ -7,6 +7,12 @@ NEXT_PUBLIC_WEBUI_HOST=http://{{ context["HOSTNAME"] }}
 {% endif %}
 PROJECT_URL={{ context.PROJECT_URL }}
 
+[login]
+ENABLE_USERPASS_LOGIN={{ context.ENABLE_USERPASS_LOGIN }}
+
+[rules]
+RULE_ACTIVITY={{ context.RULE_ACTIVITY | json }}
+
 [session]
 SESSION_PASSWORD={{ context.SESSION_PASSWORD }}
 SESSION_COOKIE_NAME={{ context.SESSION_COOKIE_NAME }}