diff --git a/src/lib/components/Form/TextField.svelte b/src/lib/components/Form/TextField.svelte
index 15791e70..be84b32d 100644
--- a/src/lib/components/Form/TextField.svelte
+++ b/src/lib/components/Form/TextField.svelte
@@ -67,7 +67,7 @@
   {/if}
   <input
     use:typeAction
-    class="form-input border-l-0 border-r-0 border-t-0 border-b-2 border-gray-200 focus:border-l-0 focus:border-r-0 rounded-t-md focus:border-t-0 focus:border-b-2 focus:border-primary-600 {inputClassName} {focusClass} dark:text-black p-3 mt-1 block w-full {bgColor} {errorMessage
+    class="form-input border-l-0 border-r-0 border-t-0 border-b-2 border-gray-200 focus:border-l-0 focus:border-r-0 rounded-t-md focus:border-t-0 focus:border-b-2 {inputClassName} {focusClass} dark:text-black p-3 mt-1 block w-full {bgColor} {errorMessage
       ? 'border-red-600'
       : ''}"
     on:keydown={onKeyDown}
@@ -78,7 +78,13 @@
     required={isRequired}
     disabled={isDisabled}
     autocomplete={autoComplete ? 'on' : 'off'}
-    on:blur={onChange}
+    on:blur={(e) => {
+      if (focusClass.includes('border-primary-600')) {
+        focusClass = focusClass.replace('border-primary-600', '');
+      }
+      onChange(e);
+    }}
+    on:focus={() => (focusClass += ' border-primary-600')}
     {name}
     {min}
     {max}
diff --git a/src/routes/+layout.server.js b/src/routes/+layout.server.js
index c17f7450..74aabe4d 100644
--- a/src/routes/+layout.server.js
+++ b/src/routes/+layout.server.js
@@ -22,7 +22,7 @@ export const load = async ({ url, cookies }) => {
 
   const _orgSiteName = cookies.get('_orgSiteName');
   const debugPlay = cookies.get('debugPlay');
-  const debugMode = _orgSiteName !== 'false';
+  const debugMode = _orgSiteName && _orgSiteName !== 'false';
   console.log('_orgSiteName', _orgSiteName);
 
   const matches = url.host.match(/([a-z 0-9 \-]+).*classroomio[.]com/);