diff --git a/RIGS/templates/eventauthorisation_request.html b/RIGS/templates/eventauthorisation_request.html
index 529d3f91..72dd2e9e 100644
--- a/RIGS/templates/eventauthorisation_request.html
+++ b/RIGS/templates/eventauthorisation_request.html
@@ -1,6 +1,7 @@
 {% extends request.is_ajax|yesno:'base_ajax.html,base_rigs.html' %}
 {% load widget_tweaks %}
 {% load static %}
+{% load button from filters %}
 
 {% block title %}Request Authorisation{% endblock %}
 
@@ -22,19 +23,26 @@
 {% block content %}
     <div class="row">
         <div class="col-sm-12">
-            <div class="alert alert-warning">
+            <div class="alert alert-warning pb-0">
                 <h1>Send authorisation request email.</h1>
-                <p>Pressing send will email the address provided. Please triple check everything before continuing.</p>
+                <p>Pressing send will email the address provided. <strong>Please triple check everything before continuing.</strong></p>
             </div>
 
-            <div class="alert alert-info">
+            <div class="alert alert-info pb-0">
+                {% if object.person.email or object.organisation.email %}
                 <dl class="dl-horizontal">
+                    {% if object.person.email %}
                     <dt>Person Email</dt>
-                    <dd id="person-email">{{ object.person.email }}</dd>{% if object.person.email %}<button class="btn btn-secondary btn-sm pr-1" data-clipboard-target="#person-email" data-content="Copied to clipboard!"><span class="fas fa-clipboard"></span></button>{% endif %}
-
+                    <dd><span id="person-email">{{ object.person.email }}</span>{% button 'copy' id='#person-email' %}</dd>
+                    {% endif %}
+                    {% if object.organisation.email %}
                     <dt>Organisation Email</dt>
-                    <dd id="org-email">{{ object.organisation.email }}</dd>{% if object.organisation.email %}<button class="btn btn-secondary btn-sm pr-1" data-clipboard-target="#org-email" data-content="Copied to clipboard!"><span class="fas fa-clipboard"></span></button>{% endif %}
+                    <dd><span id="org-email">{{ object.organisation.email }}</span>{% button 'copy' id='#org-email' %}</dd>
+                    {% endif %}
                 </dl>
+                {% else %}
+                <p>No email addresses saved to the client &#3232;_&#3232;</p>
+                {% endif %}
             </div>
             <form action="{{ form.action|default:request.path }}" method="POST" id="auth-request-form">
                 {% csrf_token %}
diff --git a/RIGS/templatetags/filters.py b/RIGS/templatetags/filters.py
index 5a4348aa..8a42a568 100644
--- a/RIGS/templatetags/filters.py
+++ b/RIGS/templatetags/filters.py
@@ -212,6 +212,8 @@ def button(type, url=None, pk=None, clazz="", icon=None, text="", id=None, style
         clazz += " btn-primary "
         icon = "fa-plus"
         text = "New"
+    elif type == 'copy':
+        return {'copy': True, 'id': id, 'style': style}
     elif type == 'search':
         return {'submit': True, 'class': 'btn-info', 'icon': 'fa-search', 'text': 'Search', 'id': id, 'style': style}
     elif type == 'submit':
diff --git a/templates/partials/button.html b/templates/partials/button.html
index e13f527a..3a353365 100644
--- a/templates/partials/button.html
+++ b/templates/partials/button.html
@@ -2,6 +2,8 @@
 <button type="submit" class="btn {{ class }}" title="{{ text }}" {% if id %}id="{{id}}"{%endif%} {% if style %}style="{{style}}"{%endif%}><span class="fas {{ icon }} align-middle"></span> <span class="d-none d-sm-inline align-middle">{{ text }}</span></button>
 {% elif pk %}
 <a href="{% url target pk %}" class="btn {{ class }}" {% if id %}id="{{id}}"{%endif%} {% if style %}style="{{style}}"{%endif%} {% if text == 'Print' %}target="_blank"{%endif%}><span class="fas {{ icon }} align-middle"></span> <span class="d-none d-sm-inline align-middle">{{ text }}</span></a>
+{% elif copy %}
+<button class="btn btn-secondary btn-sm mr-1" data-clipboard-target="{{id}}" data-content="Copied to clipboard!"><span class="fas fa-copy"></span></button>
 {% else %}
 <a href="{% url target %}" class="btn {{ class }}" {% if id %}id="{{id}}"{%endif%} {% if style %}style="{{style}}"{%endif%}><span class="fas {{ icon }} align-middle"></span> <span class="d-none d-sm-inline align-middle">{{ text }}</span></a>
 {% endif %}