diff --git a/api/beacon-sharding/allocate_business_namespace.cfm b/api/beacon-sharding/allocate_business_namespace.cfm
index 86d6bdb..296fa5e 100644
--- a/api/beacon-sharding/allocate_business_namespace.cfm
+++ b/api/beacon-sharding/allocate_business_namespace.cfm
@@ -117,9 +117,9 @@ if (bizId LTE 0) {
 <cfset shardUUID = qShard.UUID>
 
 <!--- Find next available Major within this shard --->
-<!--- Major values: 0-65535 (uint16), we start from 1 to avoid 0 --->
+<!--- Major values: 0-65535 (uint16), starting from 0 --->
 <cfquery name="qMaxMajor" datasource="payfrit">
-  SELECT COALESCE(MAX(BeaconMajor), 0) AS MaxMajor
+  SELECT COALESCE(MAX(BeaconMajor), -1) AS MaxMajor
   FROM Businesses
   WHERE BeaconShardID = <cfqueryparam cfsqltype="cf_sql_integer" value="#shardId#">
 </cfquery>
diff --git a/api/beacon-sharding/allocate_servicepoint_minor.cfm b/api/beacon-sharding/allocate_servicepoint_minor.cfm
index a3820ad..9cb33df 100644
--- a/api/beacon-sharding/allocate_servicepoint_minor.cfm
+++ b/api/beacon-sharding/allocate_servicepoint_minor.cfm
@@ -111,9 +111,9 @@ if (spId LTE 0) {
 </cfif>
 
 <!--- Find next available Minor within this business --->
-<!--- Minor values: 0-65535 (uint16), we start from 1 to avoid 0 --->
+<!--- Minor values: 0-65535 (uint16), starting from 0 --->
 <cfquery name="qMaxMinor" datasource="payfrit">
-  SELECT COALESCE(MAX(BeaconMinor), 0) AS MaxMinor
+  SELECT COALESCE(MAX(BeaconMinor), -1) AS MaxMinor
   FROM ServicePoints
   WHERE BusinessID = <cfqueryparam cfsqltype="cf_sql_integer" value="#bizId#">
 </cfquery>
diff --git a/api/beacon-sharding/register_beacon_hardware.cfm b/api/beacon-sharding/register_beacon_hardware.cfm
index 7ac0f5f..7958318 100644
--- a/api/beacon-sharding/register_beacon_hardware.cfm
+++ b/api/beacon-sharding/register_beacon_hardware.cfm
@@ -165,7 +165,14 @@ firmwareVersion = normStr(structKeyExists(data, "FirmwareVersion") ? data.Firmwa
   <cfset apiAbort({ OK=false, ERROR="servicepoint_business_mismatch", MESSAGE="Service point does not belong to this business" })>
 </cfif>
 
-<cfif qSP.BeaconMinor NEQ minor>
+<!--- If service point doesn't have a minor yet, set it now --->
+<cfif isNull(qSP.BeaconMinor) OR len(trim(qSP.BeaconMinor)) EQ 0>
+  <cfquery datasource="payfrit">
+    UPDATE ServicePoints
+    SET BeaconMinor = <cfqueryparam cfsqltype="cf_sql_smallint" value="#minor#">
+    WHERE ID = <cfqueryparam cfsqltype="cf_sql_integer" value="#spId#">
+  </cfquery>
+<cfelseif qSP.BeaconMinor NEQ minor>
   <cfset apiAbort({
     OK=false,
     ERROR="minor_mismatch",
diff --git a/api/beacons/lookup.cfm b/api/beacons/lookup.cfm
index f459859..4ae279e 100644
--- a/api/beacons/lookup.cfm
+++ b/api/beacons/lookup.cfm
@@ -35,7 +35,7 @@
       <cfset minor = int(beaconData.Minor)>
     </cfif>
 
-    <cfif len(uuid) EQ 0 OR major LTE 0 OR minor LT 0>
+    <cfif len(uuid) EQ 0 OR major LT 0 OR minor LT 0>
       <cfcontinue>
     </cfif>
 
diff --git a/api/servicepoints/save.cfm b/api/servicepoints/save.cfm
index e23fdc1..2a59a8d 100644
--- a/api/servicepoints/save.cfm
+++ b/api/servicepoints/save.cfm
@@ -89,7 +89,17 @@ if (structKeyExists(data, "IsActive")) {
   </cfif>
 
 <cfelse>
-  <!--- Insert --->
+  <!--- Auto-allocate BeaconMinor if not provided --->
+  <cfif beaconMinor LT 0>
+    <cfquery name="qMaxMinor" datasource="payfrit">
+      SELECT COALESCE(MAX(BeaconMinor), -1) AS MaxMinor
+      FROM ServicePoints
+      WHERE BusinessID = <cfqueryparam cfsqltype="cf_sql_integer" value="#request.BusinessID#">
+    </cfquery>
+    <cfset beaconMinor = qMaxMinor.MaxMinor + 1>
+  </cfif>
+
+  <!--- Insert with BeaconMinor --->
   <cfquery datasource="payfrit">
     INSERT INTO ServicePoints (
       BusinessID,
@@ -97,16 +107,16 @@ if (structKeyExists(data, "IsActive")) {
       Code,
       TypeID,
       IsActive,
-      SortOrder
-      <cfif beaconMinor GTE 0>, BeaconMinor</cfif>
+      SortOrder,
+      BeaconMinor
     ) VALUES (
       <cfqueryparam cfsqltype="cf_sql_integer" value="#request.BusinessID#">,
       <cfqueryparam cfsqltype="cf_sql_varchar" value="#spName#">,
       <cfqueryparam cfsqltype="cf_sql_varchar" value="#spCode#" null="#(len(spCode) EQ 0)#">,
       <cfqueryparam cfsqltype="cf_sql_integer" value="#spTypeID#">,
       <cfqueryparam cfsqltype="cf_sql_tinyint" value="#isActive#">,
-      <cfqueryparam cfsqltype="cf_sql_integer" value="#sortOrder#">
-      <cfif beaconMinor GTE 0>, <cfqueryparam cfsqltype="cf_sql_smallint" value="#beaconMinor#"></cfif>
+      <cfqueryparam cfsqltype="cf_sql_integer" value="#sortOrder#">,
+      <cfqueryparam cfsqltype="cf_sql_smallint" value="#beaconMinor#">
     )
   </cfquery>
 
@@ -136,12 +146,12 @@ if (structKeyExists(data, "IsActive")) {
 <cfset servicePoint = {
   "ServicePointID"    = qOut.ID,
   "BusinessID"        = qOut.BusinessID,
-  "Name"  = qOut.Name,
-  "Code"  = qOut.Code,
-  "TypeID"= qOut.TypeID,
+  "Name"              = qOut.Name,
+  "Code"              = qOut.Code,
+  "TypeID"            = qOut.TypeID,
   "IsActive"          = qOut.IsActive,
   "SortOrder"         = qOut.SortOrder,
-  "BeaconMinor"       = val(qOut.BeaconMinor)
+  "BeaconMinor"       = isNull(qOut.BeaconMinor) ? "" : qOut.BeaconMinor
 }>
 
 <cfoutput>#serializeJSON({ OK=true, ERROR="", SERVICEPOINT=servicePoint })#</cfoutput>