diff --git a/manual/source/glossary.rst b/manual/source/glossary.rst
index 39dda4c..9bd7170 100644
--- a/manual/source/glossary.rst
+++ b/manual/source/glossary.rst
@@ -16,6 +16,14 @@ Display Tags
 :ref:`display-tags` give you the ability to add additional text formatting to text in
 songs and custom slides.
 
+.. _g-wizard:
+
+First Time Wizard
+-----------------
+
+The :ref:`wizard` gives you the ability to perform a basic setup before OpenLP
+starts for the first time.
+
 .. _g-main-window:
 
 Main Window
diff --git a/manual/source/wizard.rst b/manual/source/wizard.rst
index 15f560d..23d55de 100644
--- a/manual/source/wizard.rst
+++ b/manual/source/wizard.rst
@@ -1,8 +1,10 @@
+.. _wizard:
+
 =================
 First Time Wizard
 =================
 
-When using OpenLP for the first time, the **First Time Wizard** will help you 
+When using OpenLP for the first time, the :ref:`g-wizard` will help you 
 with setting up your installation. This wizard is not intended to be a 
 comprehensive setup but will help you with the basics.
 
@@ -104,11 +106,11 @@ The main window.
 Re-run First Time Wizard
 ------------------------
 
-If you wish to add items from the First Time Wizard at a later date or had an 
+If you wish to add items from the  :ref:`g-wizard` at a later date or had an 
 error while installing OpenLP you can run it again by going to 
 :menuselection:`Tools --> Re-run First Time Wizard`. Select :guilabel:`Yes` to
-run the First Run Wizard again.
+run the :ref:`g-wizard`.
 
 .. image:: pics/rerunwizard.png
 
-After selecting :guilabel:`Yes` the First Time Wizard will run again. 
+After selecting :guilabel:`Yes` the :ref:`g-wizard` will run again.