diff --git a/GUIs.ZooFlow/ClassDataASorDB.vb b/GUIs.ZooFlow/ClassDataASorDB.vb
index 323101ed..e637fbc7 100644
--- a/GUIs.ZooFlow/ClassDataASorDB.vb
+++ b/GUIs.ZooFlow/ClassDataASorDB.vb
@@ -9,7 +9,7 @@ Public Class ClassDataASorDB
     Public Function GetDatatable(pDB As String, pSQL As String, pAppServDT As String, pAppServFilter As String, Optional pAppServSort As String = "", Optional pForce As String = "") As DataTable
         Try
             Dim oReturnDT As DataTable = Nothing
-            If EDMI_SERVICE_ACTIVE = True And pForce = String.Empty Then
+            If My.Application.Service.IsActive = True And pForce = String.Empty Then
                 Try
                     Dim oTableResult As TableResult = _Client.GetDatatableByName(pAppServDT, pAppServFilter, pAppServSort)
                     oReturnDT = oTableResult.Table
@@ -59,10 +59,7 @@ Public Class ClassDataASorDB
                 My.Application.User.DateFormat = DT_CHECKUSER_MODULE.Rows(0).Item("USER_DATE_FORMAT")
 
                 My.Application.User.IsAdmin = DT_CHECKUSER_MODULE.Rows(0).Item("IS_ADMIN")
-                ADDITIONAL_TITLE = DT_CHECKUSER_MODULE.Rows(0).Item("ADDITIONAL_TITLE")
-                If ADDITIONAL_TITLE = String.Empty Then
-                    ADDITIONAL_TITLE = My.Application.Info.ProductName
-                End If
+                ADDITIONAL_TITLE = NotNull(DT_CHECKUSER_MODULE.Rows(0).Item("ADDITIONAL_TITLE"), My.Application.Info.ProductName)
 
                 Return True
             Else
diff --git a/GUIs.ZooFlow/ClassInit.vb b/GUIs.ZooFlow/ClassInit.vb
index f12ebe96..55ecb5ad 100644
--- a/GUIs.ZooFlow/ClassInit.vb
+++ b/GUIs.ZooFlow/ClassInit.vb
@@ -176,7 +176,6 @@ Public Class ClassInit
             If Not IsNothing(_Client) Then
                 If _Client.Connect() Then
                     MyApplication.Service.IsActive = True
-                    EDMI_SERVICE_ACTIVE = True
                 End If
             End If
 
diff --git a/GUIs.ZooFlow/modCurrent.vb b/GUIs.ZooFlow/modCurrent.vb
index 76544438..c9c80bd6 100644
--- a/GUIs.ZooFlow/modCurrent.vb
+++ b/GUIs.ZooFlow/modCurrent.vb
@@ -1,15 +1,14 @@
 Imports DigitalData.Modules.EDMI.API
 
 Module modCurrent
-    Public _Client As Client
-    Public ADDITIONAL_TITLE As String
-    Public DT_CONNECTIONS As DataTable
-    Public EDMI_SERVICE_ACTIVE As Boolean = False
-    Public CURR_MISSING_PATTERN_NAME = "Email To"
-    Public CURR_MISSING_SEARCH_STRING = String.Empty
-    Public CURR_MISSING_MANUAL_VALUE = String.Empty
-    Public NI_TITLE As String = ""
-    Public NI_MESSAGE As String = ""
-    Public NI_TYPE As String = "INFO"
-    Public clsDataASorDB As ClassDataASorDB
+    Public Property _Client As Client
+    Public Property ADDITIONAL_TITLE As String
+    Public Property DT_CONNECTIONS As DataTable
+    Public Property CURR_MISSING_PATTERN_NAME = "Email To"
+    Public Property CURR_MISSING_SEARCH_STRING = String.Empty
+    Public Property CURR_MISSING_MANUAL_VALUE = String.Empty
+    Public Property NI_TITLE As String = ""
+    Public Property NI_MESSAGE As String = ""
+    Public Property NI_TYPE As String = "INFO"
+    Public Property clsDataASorDB As ClassDataASorDB
 End Module