diff --git a/notes/deploy.txt b/notes/deploy.txt
index fb9a81b..371eb59 100644
--- a/notes/deploy.txt
+++ b/notes/deploy.txt
@@ -5,7 +5,7 @@
 1) SET VERSION
 
 SET app.api RFVERSION property
-RENAME ?rfv=6.16 parameter in default.htm to the new version so all files update on mobile 
+RENAME ?rfv=6.18 parameter in default.htm to the new version so all files update on mobile 
 
 1.5) Run buildtemplates.bat if handlebars templates have changed at all
 
diff --git a/util/RfVersion.cs b/util/RfVersion.cs
index 18d227e..186d542 100644
--- a/util/RfVersion.cs
+++ b/util/RfVersion.cs
@@ -2,7 +2,7 @@ namespace rockfishCore.Util
 {    
     public static class RfVersion
     {
-        public const string NumberOnly="6.17";
+        public const string NumberOnly="6.18";
         public const string Full = "Rockfish server " + NumberOnly;                
     }
 }
\ No newline at end of file
diff --git a/wwwroot/default.htm b/wwwroot/default.htm
index d42ed7d..abd7325 100644
--- a/wwwroot/default.htm
+++ b/wwwroot/default.htm
@@ -11,73 +11,73 @@
   <title>Rockfish loading....</title>
 
   <!-- ICONS / MANIFEST -->
-  <link rel="apple-touch-icon" sizes="180x180" href="/apple-touch-icon.png?rfv=6.17">
-  <link rel="icon" type="image/png" sizes="32x32" href="/favicon-32x32.png?rfv=6.17">
-  <link rel="icon" type="image/png" sizes="16x16" href="/favicon-16x16.png?rfv=6.17">
-  <link rel="manifest" href="/manifest.json?rfv=6.17">
-  <link rel="mask-icon" href="/safari-pinned-tab.svg?rfv=6.17" color="#5bbad5">
+  <link rel="apple-touch-icon" sizes="180x180" href="/apple-touch-icon.png?rfv=6.18">
+  <link rel="icon" type="image/png" sizes="32x32" href="/favicon-32x32.png?rfv=6.18">
+  <link rel="icon" type="image/png" sizes="16x16" href="/favicon-16x16.png?rfv=6.18">
+  <link rel="manifest" href="/manifest.json?rfv=6.18">
+  <link rel="mask-icon" href="/safari-pinned-tab.svg?rfv=6.18" color="#5bbad5">
   <meta name="theme-color" content="#ffffff">
 
 
   <!-- 3rd party components fonts and icons -->
-  <link href="css/materialdesignicons.min.css?rfv=6.17" media="all" rel="stylesheet" type="text/css" />
-  <link rel="stylesheet" href="css/bootstrap.min.css?rfv=6.17" type="text/css" />
-  <link rel="stylesheet" href="css/app.css?rfv=6.17" type="text/css" />
-  <link rel="stylesheet" href="css/mdi-bs4-compat.css?rfv=6.17" type="text/css" />
+  <link href="css/materialdesignicons.min.css?rfv=6.18" media="all" rel="stylesheet" type="text/css" />
+  <link rel="stylesheet" href="css/bootstrap.min.css?rfv=6.18" type="text/css" />
+  <link rel="stylesheet" href="css/app.css?rfv=6.18" type="text/css" />
+  <link rel="stylesheet" href="css/mdi-bs4-compat.css?rfv=6.18" type="text/css" />
 
 
 
   <!-- third-party javascript -->
-  <script src="js/lib/jquery-3.3.1.min.js?rfv=6.17"></script>
-  <script src="js/lib/page.js?rfv=6.17"></script>
-  <script src="js/lib/jquery.event.gevent.js?rfv=6.17"></script>
-  <script src="js/lib/jquery.gzserialize.js?rfv=6.17"></script>
-  <script src="js/lib/handlebars.runtime.min-v4.7.6.js?rfv=6.17"></script>
-  <script src="js/lib/store.min.js?rfv=6.17"></script>
-  <script src="js/lib/jquery.autocomplete.min.js?rfv=6.17"></script>
-  <script src="js/lib/moment.min.js?rfv=6.17"></script>
+  <script src="js/lib/jquery-3.3.1.min.js?rfv=6.18"></script>
+  <script src="js/lib/page.js?rfv=6.18"></script>
+  <script src="js/lib/jquery.event.gevent.js?rfv=6.18"></script>
+  <script src="js/lib/jquery.gzserialize.js?rfv=6.18"></script>
+  <script src="js/lib/handlebars.runtime.min-v4.7.6.js?rfv=6.18"></script>
+  <script src="js/lib/store.min.js?rfv=6.18"></script>
+  <script src="js/lib/jquery.autocomplete.min.js?rfv=6.18"></script>
+  <script src="js/lib/moment.min.js?rfv=6.18"></script>
 
   <!-- our javascript -->  
-  <script src="js/index.js?rfv=6.17"></script>
-  <script src="js/app.util.js?rfv=6.17"></script>
-  <script src="js/app.api.js?rfv=6.17"></script>
-  <script src="js/app.utilB.js?rfv=6.17"></script>
-  <script src="js/app.nav.js?rfv=6.17"></script>
-  <script src="js/app.shell.js?rfv=6.17"></script>
-  <script src="js/app.fourohfour.js?rfv=6.17"></script>
-  <script src="js/app.authenticate.js?rfv=6.17"></script>
-  <script src="js/app.customers.js?rfv=6.17"></script>
-  <script src="js/app.customerEdit.js?rfv=6.17"></script>
-  <script src="js/app.customerSites.js?rfv=6.17"></script>
-  <script src="js/app.customerSiteEdit.js?rfv=6.17"></script>
-  <script src="js/app.purchases.js?rfv=6.17"></script>
-  <script src="js/app.purchaseEdit.js?rfv=6.17"></script>
-  <script src="js/app.license.js?rfv=6.17"></script>
-  <script src="js/app.licenseTemplates.js?rfv=6.17"></script>
-  <script src="js/app.licenseRequestEdit.js?rfv=6.17"></script>
-  <script src="js/app.licenses.js?rfv=6.17"></script>
-  <script src="js/app.licenseView.js?rfv=6.17"></script>
-  <script src="js/app.reportData.js?rfv=6.17"></script>
-  <script src="js/app.reportDataProdEmail.js?rfv=6.17"></script>
-  <script src="js/app.reportDataExpires.js?rfv=6.17"></script>
-  <script src="js/app.search.js?rfv=6.17"></script>
-  <script src="js/app.subscription.js?rfv=6.17"></script>
-  <script src="js/app.subnotify.js?rfv=6.17"></script>
-  <script src="js/app.templates.js?rfv=6.17"></script>
-  <script src="js/app.templateEdit.js?rfv=6.17"></script>
-  <script src="js/app.inbox.js?rfv=6.17"></script>
-  <script src="js/app.mailEdit.js?rfv=6.17"></script>
-  <script src="js/app.rfcaseEdit.js?rfv=6.17"></script>
-  <script src="js/app.rfcases.js?rfv=6.17"></script>
-  <script src="js/app.rfsettings.js?rfv=6.17"></script>
-  <script src="js/app.ops.js?rfv=6.17"></script>
-  <script src="js/app.trials.js?rfv=6.17"></script>
-  <script src="js/app.trialEdit.js?rfv=6.17"></script>
-  <script src="js/app.ravLicenses.js?rfv=6.17"></script>
-  <script src="js/app.ravLicense.js?rfv=6.17"></script>
+  <script src="js/index.js?rfv=6.18"></script>
+  <script src="js/app.util.js?rfv=6.18"></script>
+  <script src="js/app.api.js?rfv=6.18"></script>
+  <script src="js/app.utilB.js?rfv=6.18"></script>
+  <script src="js/app.nav.js?rfv=6.18"></script>
+  <script src="js/app.shell.js?rfv=6.18"></script>
+  <script src="js/app.fourohfour.js?rfv=6.18"></script>
+  <script src="js/app.authenticate.js?rfv=6.18"></script>
+  <script src="js/app.customers.js?rfv=6.18"></script>
+  <script src="js/app.customerEdit.js?rfv=6.18"></script>
+  <script src="js/app.customerSites.js?rfv=6.18"></script>
+  <script src="js/app.customerSiteEdit.js?rfv=6.18"></script>
+  <script src="js/app.purchases.js?rfv=6.18"></script>
+  <script src="js/app.purchaseEdit.js?rfv=6.18"></script>
+  <script src="js/app.license.js?rfv=6.18"></script>
+  <script src="js/app.licenseTemplates.js?rfv=6.18"></script>
+  <script src="js/app.licenseRequestEdit.js?rfv=6.18"></script>
+  <script src="js/app.licenses.js?rfv=6.18"></script>
+  <script src="js/app.licenseView.js?rfv=6.18"></script>
+  <script src="js/app.reportData.js?rfv=6.18"></script>
+  <script src="js/app.reportDataProdEmail.js?rfv=6.18"></script>
+  <script src="js/app.reportDataExpires.js?rfv=6.18"></script>
+  <script src="js/app.search.js?rfv=6.18"></script>
+  <script src="js/app.subscription.js?rfv=6.18"></script>
+  <script src="js/app.subnotify.js?rfv=6.18"></script>
+  <script src="js/app.templates.js?rfv=6.18"></script>
+  <script src="js/app.templateEdit.js?rfv=6.18"></script>
+  <script src="js/app.inbox.js?rfv=6.18"></script>
+  <script src="js/app.mailEdit.js?rfv=6.18"></script>
+  <script src="js/app.rfcaseEdit.js?rfv=6.18"></script>
+  <script src="js/app.rfcases.js?rfv=6.18"></script>
+  <script src="js/app.rfsettings.js?rfv=6.18"></script>
+  <script src="js/app.ops.js?rfv=6.18"></script>
+  <script src="js/app.trials.js?rfv=6.18"></script>
+  <script src="js/app.trialEdit.js?rfv=6.18"></script>
+  <script src="js/app.ravLicenses.js?rfv=6.18"></script>
+  <script src="js/app.ravLicense.js?rfv=6.18"></script>
 
   <!-- handlebars templates -->
-  <script src="js/templates/templates.js?rfv=6.17"></script>
+  <script src="js/templates/templates.js?rfv=6.18"></script>
 
 
   <script>
@@ -107,7 +107,7 @@ window.onerror = function ( error ) {
 
 <body class="rf-body">
   <div id="app" class="container"></div>
-  <script src="js/lib/bootstrap.min.js?rfv=6.17"></script>
+  <script src="js/lib/bootstrap.min.js?rfv=6.18"></script>
 </body>
 
 </html>
\ No newline at end of file
diff --git a/wwwroot/js/app.api.js b/wwwroot/js/app.api.js
index 8c60832..6929abe 100644
--- a/wwwroot/js/app.api.js
+++ b/wwwroot/js/app.api.js
@@ -29,7 +29,7 @@ app.api = (function () {
     generateFromRequest,
     licenseEmailResponse;
 
-  RockFishVersion = "6.16";
+  RockFishVersion = "6.18";
 
   //////////////////////////////////////////////////////////////////////////////////////
   //         NOT AUTHORIZED ERROR HANDLER