diff --git a/README.md b/README.md
index 97d3be9e..0edfd983 100644
--- a/README.md
+++ b/README.md
@@ -8,3 +8,7 @@ It also contains our legacy front-end. In case of large PR regarding our front-e
 If you want to get set up to make a contribution, please see the [cp-local-development repository](https://github.com/CoderDojo/cp-local-development).
 
 General documentation is in the [community-platform repository](https://github.com/CoderDojo/community-platform).
+
+## Debugging
+
+You can see HAPI interactions by setting `HAPI_DEBUG` to `true` in `web/config/development.env`.  This then outputs data to `/tmp/hapi-zen-platform.log` inside the zen container.
diff --git a/gulpfile.js b/gulpfile.js
index 63ab0b2a..79e7cca0 100644
--- a/gulpfile.js
+++ b/gulpfile.js
@@ -184,6 +184,9 @@ gulp.task('dev', ['watch-less'], () => {
       relativePath('./web/public/components/*'),
       relativePath('./web/public/dist/*'),
     ],
+    execMap: {
+      js: "node --max-http-header-size=81920"
+    },
     script: 'index.js',
     ext: 'js dust json',
     tasks: ['build'],
diff --git a/web/config/development.env b/web/config/development.env
index ad518b63..ba6c8756 100644
--- a/web/config/development.env
+++ b/web/config/development.env
@@ -2,6 +2,7 @@ EVENTS_SERVICE=events2
 EMAIL_SERVICE=email
 USERS_SERVICE=users
 CLUBS_SERVICE=clubs
+HAPI_DEBUG=false
 HOSTED_URL=http://localhost:8000
 RPI_AUTH_URL=http://localhost:9001/
 RPI_PROFILE_URL=http://localhost:3002
diff --git a/web/controllers/rpi/index.js b/web/controllers/rpi/index.js
index 633d1c79..5486e8fe 100644
--- a/web/controllers/rpi/index.js
+++ b/web/controllers/rpi/index.js
@@ -26,6 +26,8 @@ function getErrorRedirectUrl(message = oauthErrorMessage) {
 }
 
 function handleRPILogin(request, reply, redirectQueryParams = { login_options: 'v1_signup' }) {
+  clearSession(request, reply);
+
   const returnTo = request.query['returnTo'];
   const state = crypto.randomBytes(20).toString('hex');
 
@@ -35,6 +37,8 @@ function handleRPILogin(request, reply, redirectQueryParams = { login_options: '
 }
 
 function handleRPILogout(request, reply) {
+  clearSession(request, reply);
+
   const session = request.state['seneca-login'];
   if (!session || (session && !session.token)) {
     return reply.redirect('/');
@@ -43,9 +47,7 @@ function handleRPILogout(request, reply) {
   const msg = { role: 'user', cmd: 'logout', token: session.token };
   return request.seneca.act(msg, err => {
     if (err) return reply(Boom.badImplementation(err));
-    request.cookieAuth.clear();
-    clearRpiStateCookie(reply);
-    delete request.user;
+
     const redirectUri = getLogoutRedirectUri();
     return reply.redirect(redirectUri);
   });
@@ -65,6 +67,12 @@ function handleRPIEdit(request, reply) {
   reply.redirect(redirectUri);
 }
 
+function clearSession(request, reply) {
+  request.cookieAuth.clear();
+  clearRpiStateCookie(reply);
+  delete request.user;
+}
+
 function getZenRegisterPayload(decodedIdToken, isAttendee) {
   return {
     isTrusted: true,