diff --git a/docs/api_reference/conf.py b/docs/api_reference/conf.py
index de8eafc..46f454b 100644
--- a/docs/api_reference/conf.py
+++ b/docs/api_reference/conf.py
@@ -92,13 +92,13 @@ pygments_style = 'sphinx'
 
 #Option to add text substitutions to all .rst files being built.
 rst_prolog = """
-.. |freenas| replace:: FreeNAS"""u'\u00AE'"""
-.. |truenas| replace:: TrueNAS"""u'\u00AE'"""
-.. |pcbsd| replace:: PC-BSD"""u'\u00AE'"""
-.. |trueos| replace:: TrueOS"""u'\u00AE'"""
-.. |appcafe| replace:: AppCafe"""u'\u00AE'"""
-.. |lumina| replace:: Lumina"""u'\u00AE'"""
-.. |sysadm| replace:: SysAdm"""u'\u2122'"""
+.. |freenas| replace:: FreeNAS\ :sup:`"""u'\u00AE'"""`
+.. |truenas| replace:: TrueNAS\ :sup:`"""u'\u00AE'"""`
+.. |pcbsd| replace:: PC-BSD\ :sup:`"""u'\u00AE'"""`
+.. |trueos| replace:: TrueOS\ :sup:`"""u'\u00AE'"""`
+.. |appcafe| replace:: AppCafe\ :sup:`"""u'\u00AE'"""`
+.. |lumina| replace:: Lumina\ :sup:`"""u'\u00AE'"""`
+.. |sysadm| replace:: SysAdm\ :sup:`"""u'\u2122'"""`
 """
 
 # -- Option to change :menuselection: arrow -----------------------------
diff --git a/docs/client_handbook/conf.py b/docs/client_handbook/conf.py
index 7a42747..f1a64c3 100644
--- a/docs/client_handbook/conf.py
+++ b/docs/client_handbook/conf.py
@@ -122,13 +122,13 @@ todo_include_todos = True
 
 #Option to add text substitutions to all .rst files being built.
 rst_prolog = """
-.. |freenas| replace:: FreeNAS"""u'\u00AE'"""
-.. |truenas| replace:: TrueNAS"""u'\u00AE'"""
-.. |pcbsd| replace:: PC-BSD"""u'\u00AE'"""
-.. |trueos| replace:: TrueOS"""u'\u00AE'"""
-.. |appcafe| replace:: AppCafe"""u'\u00AE'"""
-.. |lumina| replace:: Lumina"""u'\u00AE'"""
-.. |sysadm| replace:: SysAdm"""u'\u2122'"""
+.. |freenas| replace:: FreeNAS\ :sup:`"""u'\u00AE'"""`
+.. |truenas| replace:: TrueNAS\ :sup:`"""u'\u00AE'"""`
+.. |pcbsd| replace:: PC-BSD\ :sup:`"""u'\u00AE'"""`
+.. |trueos| replace:: TrueOS\ :sup:`"""u'\u00AE'"""`
+.. |appcafe| replace:: AppCafe\ :sup:`"""u'\u00AE'"""`
+.. |lumina| replace:: Lumina\ :sup:`"""u'\u00AE'"""`
+.. |sysadm| replace:: SysAdm\ :sup:`"""u'\u2122'"""`
 """
 
 # -- Option to change :menuselection: arrow -----------------------------
diff --git a/docs/client_handbook/images/login5.png b/docs/client_handbook/images/login5.png
new file mode 100644
index 0000000..a63d4cb
Binary files /dev/null and b/docs/client_handbook/images/login5.png differ
diff --git a/docs/client_handbook/sysadmclient.rst b/docs/client_handbook/sysadmclient.rst
index 949eeee..eb168af 100644
--- a/docs/client_handbook/sysadmclient.rst
+++ b/docs/client_handbook/sysadmclient.rst
@@ -962,7 +962,13 @@ Once a user has been initialized for PersonaCrypt on the system, their
 user account will no longer be displayed when logging in, **unless**
 their PersonaCrypt device is inserted. Once the USB device is inserted,
 the login screen will add an extra field, as seen in the example shown
-in :ref:`login5`.
+in :numref:`Figure %s <troslogin5>`.
+
+.. _troslogin5:
+
+.. figure:: images/login5.png
+
+   : |trueos| Login Screen with PersonaCrypt
 
 .. note:: When stealth sessions have been configured, PersonaCrypt
    users will still be displayed in the login menu, even if their USB
diff --git a/docs/server_handbook/conf.py b/docs/server_handbook/conf.py
index 62ea8e7..6a170f2 100644
--- a/docs/server_handbook/conf.py
+++ b/docs/server_handbook/conf.py
@@ -88,13 +88,13 @@ pygments_style = 'sphinx'
 
 #Option to add text substitutions to all .rst files being built.
 rst_prolog = """
-.. |freenas| replace:: FreeNAS"""u'\u00AE'"""
-.. |truenas| replace:: TrueNAS"""u'\u00AE'"""
-.. |pcbsd| replace:: PC-BSD"""u'\u00AE'"""
-.. |trueos| replace:: TrueOS"""u'\u00AE'"""
-.. |appcafe| replace:: AppCafe"""u'\u00AE'"""
-.. |lumina| replace:: Lumina"""u'\u00AE'"""
-.. |sysadm| replace:: SysAdm"""u'\u2122'"""
+.. |freenas| replace:: FreeNAS\ :sup:`"""u'\u00AE'"""`
+.. |truenas| replace:: TrueNAS\ :sup:`"""u'\u00AE'"""`
+.. |pcbsd| replace:: PC-BSD\ :sup:`"""u'\u00AE'"""`
+.. |trueos| replace:: TrueOS\ :sup:`"""u'\u00AE'"""`
+.. |appcafe| replace:: AppCafe\ :sup:`"""u'\u00AE'"""`
+.. |lumina| replace:: Lumina\ :sup:`"""u'\u00AE'"""`
+.. |sysadm| replace:: SysAdm\ :sup:`"""u'\u2122'"""`
 """
 
 # -- Option to change :menuselection: arrow -----------------------------