diff --git a/app/controllers/admin/enquiry_responses_controller.rb b/app/controllers/admin/enquiry_responses_controller.rb
index 37421c739..10ac2f465 100644
--- a/app/controllers/admin/enquiry_responses_controller.rb
+++ b/app/controllers/admin/enquiry_responses_controller.rb
@@ -9,8 +9,6 @@ class Admin::EnquiryResponsesController < Admin::BaseController
   skip_before_action :authenticate_editor!, raise: false
 
   def new
-    return redirect_to 'https://www.great.gov.uk/under-maintenance/'
-
     @enquiry ||= Enquiry.find(params.fetch(:id, nil))
     @companies_house_url ||= companies_house_url(@enquiry.company_house_number)
     @enquiry_response = EnquiryResponse.find_or_initialize_by(enquiry_id: @enquiry.id)
diff --git a/app/controllers/enquiries_controller.rb b/app/controllers/enquiries_controller.rb
index 5cc12def9..f07b8e997 100644
--- a/app/controllers/enquiries_controller.rb
+++ b/app/controllers/enquiries_controller.rb
@@ -6,8 +6,6 @@ class EnquiriesController < ApplicationController
   before_action :log_cloudfront_headers
 
   def new
-    return redirect_to 'https://www.great.gov.uk/under-maintenance/'
-
     @opportunity = Opportunity.published.find_by!(slug: params[:slug])
     @enquiry = Enquiry.new_from_sso(cookies[Figaro.env.SSO_SESSION_COOKIE])
     if @opportunity.expired?
diff --git a/app/controllers/users/omniauth_callbacks_controller.rb b/app/controllers/users/omniauth_callbacks_controller.rb
index 7afb7824a..24dfbd075 100644
--- a/app/controllers/users/omniauth_callbacks_controller.rb
+++ b/app/controllers/users/omniauth_callbacks_controller.rb
@@ -19,6 +19,7 @@ def magna
     sso_id = cookies[sso_session_cookie]
     if sso_user = DirectoryApiClient.user_data(sso_id)
       request.env['omniauth.auth']['info'] = sso_user
+      request.env['omniauth.auth']['uid'] = sso_user['id']
       @user = User.from_omniauth(request.env['omniauth.auth'])
       sign_in_and_redirect @user
       set_flash_message(:notice, :success) if is_navigational_format?