diff --git a/templates/freelancer_Login.html b/templates/freelancer_Login.html
index 2f271cd..b2c429b 100644
--- a/templates/freelancer_Login.html
+++ b/templates/freelancer_Login.html
@@ -10,6 +10,7 @@
             <form action="/freelancer/login/fulfilment" method="post">
                 <label for="freelanceremail">E-Mail:</label> <input type="email" id="freelanceremail" name="freelanceremail" value=""><br>
                 <label for="freelancerpassword">Password: </label> <input type="password" id="freelancerpassword" name="freelancerpassword" value=""><br>
+                <label for="stayloggedin">Stay Logged In: </label> <input type="checkbox" id="stayloggedin" name="stayloggedin"><br>
                 <button type="submit" class="button">Log In</button>
             </form>
         {{/cookieloggedin}}
diff --git a/templates/freelancer_Signup.html b/templates/freelancer_Signup.html
index d7f2906..fbe82f2 100644
--- a/templates/freelancer_Signup.html
+++ b/templates/freelancer_Signup.html
@@ -9,7 +9,7 @@
         <form action="/freelancer/signup/fulfilment" method="post">
             <label for="freelancername">Name:</label> <input type="text" id="freelancername" name="freelancername" value=""><br>
             <label for="freelanceremail">E-Mail:</label> <input type="email" id="freelanceremail" name="freelanceremail" value=""><br>
-            <label for="freelancerpassword">Password: </label> <input type="password" id="password" name="password" value=""><br>
+            <label for="freelancerpassword">Password: </label> <input type="password" id="freelancerpassword" name="freelancerpassword" value=""><br>
             <button type="submit" class="button">Sign Up</button>
         </form>
     <br>
diff --git a/templates/freelancer_Signup_Fulfilment.html b/templates/freelancer_Signup_Fulfilment.html
index 7824031..44d9ace 100644
--- a/templates/freelancer_Signup_Fulfilment.html
+++ b/templates/freelancer_Signup_Fulfilment.html
@@ -8,28 +8,28 @@
         <form action="/freelancer/login" method="get">
             <button type="submit" class="button">Registration of [{{freelanceremail}} - {{freelancername}}] Successful</button>
         </form>
-    {{/REGISTRATION_SUCCESS}}
-    {{#REGISTRATION_ERROR}}    
-        {{#REGISTRATION_ERROR_QUERY}}
-            <div>
-                The Freelancer could not be created
-            </div>
-        {{/REGISTRATION_ERROR_QUERY}}
-        {{#REGISTRATION_ERROR_CRITICAL}}
-            <div>
-                The Freelancer could not be created: Critical
-            </div>
-        {{/REGISTRATION_ERROR_CRITICAL}}
-        {{#REGISTRATION_ERROR_EMAIL_ALREADY_IN_USE}}
-            <div>
-                Email: {{freelanceremail}} Is already in use - Freelancer was not created.
-            </div>
-        {{/REGISTRATION_ERROR_EMAIL_ALREADY_IN_USE}}
-        {{#REGISTRATION_ERROR_EMAIL_NAME_PASS_NOT_FILLED}}
-            <div>
-                The registration form has not been filled out completely
-            </div>
-        {{/REGISTRATION_ERROR_EMAIL_NAME_PASS_NOT_FILLED}}
+    {{/REGISTRATION_SUCCESS}}  
+    {{#REGISTRATION_ERROR_QUERY}}
+        <div>
+            The Freelancer could not be created
+        </div>
+    {{/REGISTRATION_ERROR_QUERY}}
+    {{#REGISTRATION_ERROR_CRITICAL}}
+        <div>
+            The Freelancer could not be created: Critical
+        </div>
+    {{/REGISTRATION_ERROR_CRITICAL}}
+    {{#REGISTRATION_ERROR_EMAIL_ALREADY_IN_USE}}
+        <div>
+            Email: {{freelanceremail}} Is already in use - Freelancer was not created.
+        </div>
+    {{/REGISTRATION_ERROR_EMAIL_ALREADY_IN_USE}}
+    {{#REGISTRATION_ERROR_EMAIL_NAME_PASS_NOT_FILLED}}
+        <div>
+            The registration form has not been filled out completely
+        </div>
+    {{/REGISTRATION_ERROR_EMAIL_NAME_PASS_NOT_FILLED}}
+    {{#REGISTRATION_ERROR}}  
         <form action="/freelancer/signup" method="get">
             <button type="submit" class="button">Registration Error: Return to signup</button>
         </form>
diff --git a/templates/freelancer_login.html b/templates/freelancer_login.html
index 2f271cd..b2c429b 100644
--- a/templates/freelancer_login.html
+++ b/templates/freelancer_login.html
@@ -10,6 +10,7 @@
             <form action="/freelancer/login/fulfilment" method="post">
                 <label for="freelanceremail">E-Mail:</label> <input type="email" id="freelanceremail" name="freelanceremail" value=""><br>
                 <label for="freelancerpassword">Password: </label> <input type="password" id="freelancerpassword" name="freelancerpassword" value=""><br>
+                <label for="stayloggedin">Stay Logged In: </label> <input type="checkbox" id="stayloggedin" name="stayloggedin"><br>
                 <button type="submit" class="button">Log In</button>
             </form>
         {{/cookieloggedin}}