diff --git a/src/maps/MapBase.tsx b/src/maps/MapBase.tsx
index 911b462..dcf9482 100644
--- a/src/maps/MapBase.tsx
+++ b/src/maps/MapBase.tsx
@@ -282,7 +282,7 @@ export default function MapBase(props: Props) {
       hm.settings.longitude = mapRef.current.getCenter().lng;
       hm.settings.latitude = mapRef.current.getCenter().lat;
       homeMarkerAPI
-        .addHomeMarker(hm.settings)
+        .addHomeMarker(hm.settings, as)
         .then(resp => {
           setHomeKey(resp.data.homeMarker);
           openSnack("New Home Marker Created");
@@ -298,7 +298,7 @@ export default function MapBase(props: Props) {
       hm.settings.longitude = longitude;
       hm.settings.userId = as ? as : user.id();
       homeMarkerAPI
-        .updateHomeMarker(homeKey, hm.settings)
+        .updateHomeMarker(homeKey, hm.settings, undefined, as)
         .then(resp => {
           openSnack("Home Marker Moved");
         })
diff --git a/src/providers/pond/homeMarkerAPI.tsx b/src/providers/pond/homeMarkerAPI.tsx
index ac11573..16eb723 100644
--- a/src/providers/pond/homeMarkerAPI.tsx
+++ b/src/providers/pond/homeMarkerAPI.tsx
@@ -7,7 +7,8 @@ import { pondURL } from "./pond";
 
 export interface IHomeMarkerAPIContext {
   addHomeMarker: (
-    homeMarker: pond.HomeMarkerSettings
+    homeMarker: pond.HomeMarkerSettings,
+    as?: string
   ) => Promise<AxiosResponse<pond.AddHomeMarkerResponse>>;
   getHomeMarker: (homeMarkerID: string) => Promise<AxiosResponse<pond.HomeMarker>>;
   listHomeMarkers: (
@@ -23,7 +24,8 @@ export interface IHomeMarkerAPIContext {
   updateHomeMarker: (
     key: string,
     homeMarker: pond.HomeMarkerSettings,
-    asRoot?: true
+    asRoot?: true,
+    as?:string
   ) => Promise<AxiosResponse<pond.UpdateHomeMarkerResponse>>;
 }
 
@@ -36,9 +38,9 @@ interface Props {}
 export default function HomeMarkerProvider(props: PropsWithChildren<Props>) {
   const { children } = props;
   const { get, del, post, put } = useHTTP();
-  const [{ as }] = useGlobalState();
+  //const [{ as }] = useGlobalState();
 
-  const addHomeMarker = (homeMarker: pond.HomeMarkerSettings) => {
+  const addHomeMarker = (homeMarker: pond.HomeMarkerSettings, as?: string) => {
     if (as) return post<pond.AddHomeMarkerResponse>(pondURL("/homeMarkers?as=" + as), homeMarker);
     return post<pond.AddHomeMarkerResponse>(pondURL("/homeMarkers"), homeMarker);
   };
@@ -76,7 +78,7 @@ export default function HomeMarkerProvider(props: PropsWithChildren<Props>) {
     );
   };
 
-  const updateHomeMarker = (key: string, hm: pond.HomeMarkerSettings, asRoot?: boolean) => {
+  const updateHomeMarker = (key: string, hm: pond.HomeMarkerSettings, asRoot?: boolean, as?: string) => {
     if (as)
       return put<pond.UpdateHomeMarkerResponse>(
         pondURL(