diff --git a/public/manage/users.php b/public/manage/users.php
index 2700347a..37025db9 100644
--- a/public/manage/users.php
+++ b/public/manage/users.php
@@ -194,10 +194,6 @@ switch ($_GET['v'] ?? null) {
                 $updatePassword->execute();
             }
 
-            if (!empty($_POST['profile']) && is_array($_POST['profile'])) {
-                user_profile_fields_set($userId, $_POST['profile']);
-            }
-
             if (isset($_POST['add_role'])) {
                 user_role_add($manageUser['user_id'], $_POST['add_role']['role']);
             }
diff --git a/templates/_layout/header.twig b/templates/_layout/header.twig
index ced82f8f..9ab4c1c2 100644
--- a/templates/_layout/header.twig
+++ b/templates/_layout/header.twig
@@ -1,9 +1,11 @@
+{% set in_manage = manage_menu is defined %}
+
 <nav class="header">
     <div class="header__wrapper">
         <div class="header__icons">
             <label class="header__icon header__icon--menu" for="toggle-mobile-header-menu"></label>
 
-            <a class="header__logo{% if manage_menu is defined %} header__logo--manage{% endif %}" href="/">
+            <a class="header__logo{% if in_manage %} header__logo--manage{% endif %}" href="/">
                 {{ globals.site_name }}
             </a>
 
@@ -70,8 +72,12 @@
                         </li>
                         {% if has_manage_access %}
                             <li class="header__user__action">
-                                <a class="header__user__link" href="{{ manage_link|default('/manage/index.php') }}">Manage</a>
-                        </li>
+                                {% if in_manage %}
+                                    <a class="header__user__link" href="{{ site_link|default('/') }}">Return</a>
+                                {% else %}
+                                    <a class="header__user__link" href="{{ manage_link|default('/manage/index.php') }}">Manage</a>
+                                {% endif %}
+                            </li>
                         {% endif %}
                         <li class="header__user__action">
                             <a class="header__user__link" href="/auth.php?m=logout&amp;s={{ csrf_token() }}">Log out</a>
diff --git a/templates/manage/changelog/change_edit.twig b/templates/manage/changelog/change_edit.twig
index cd282306..ec438f76 100644
--- a/templates/manage/changelog/change_edit.twig
+++ b/templates/manage/changelog/change_edit.twig
@@ -1,5 +1,9 @@
 {% extends 'manage/changelog/master.twig' %}
 
+{% if edit_change is defined %}
+    {% set site_link = '/changelog.php?c=' ~ edit_change.change_id %}
+{% endif %}
+
 {% block manage_content %}
     <div class="container">
         <form action="?v=change{{ edit_change is defined ? '&c=' ~ edit_change.change_id : '' }}" method="post">
diff --git a/templates/manage/changelog/master.twig b/templates/manage/changelog/master.twig
index f04b5b59..982efdb5 100644
--- a/templates/manage/changelog/master.twig
+++ b/templates/manage/changelog/master.twig
@@ -1 +1,5 @@
 {% extends 'manage/master.twig' %}
+
+{% if site_link is not defined %}
+    {% set site_link = '/changelog.php' %}
+{% endif %}
diff --git a/templates/manage/users/master.twig b/templates/manage/users/master.twig
index f04b5b59..c04fe7cf 100644
--- a/templates/manage/users/master.twig
+++ b/templates/manage/users/master.twig
@@ -1 +1,5 @@
 {% extends 'manage/master.twig' %}
+
+{% if site_link is not defined %}
+    {% set site_link = '/members.php' %}
+{% endif %}
diff --git a/templates/manage/users/view.twig b/templates/manage/users/view.twig
index 908f7cd1..bad16b3a 100644
--- a/templates/manage/users/view.twig
+++ b/templates/manage/users/view.twig
@@ -1,6 +1,8 @@
 {% extends 'manage/users/master.twig' %}
 {% from 'manage/macros.twig' import permissions_table %}
 
+{% set site_link = '/profile.php?u=' ~ view_user.user_id %}
+
 {% block manage_content %}
     {% if can_manage_users %}
         <form method="post" enctype="multipart/form-data" action="">
@@ -102,19 +104,6 @@
                 </label>
             </div>
 
-            <div class="container">
-                <div class="container__title">Profile fields</div>
-
-                {% for name, props in profile_fields %}
-                    <label class="form__label">
-                        <div class="form__label__text">{{ props.name }}</div>
-                        <div class="form__label__input">
-                            <input class="input__text" type="{{ props.type|default('text') }}" value="{{ view_user['user_' ~ name] }}" name="profile[{{ name }}]">
-                        </div>
-                    </label>
-                {% endfor %}
-            </div>
-
             <div class="container">
                 <div class="container__title">Colour</div>