diff --git a/web/src/store/admin/apiServices.ts b/web/src/store/admin/apiServices.ts
index 3898679..64907e2 100644
--- a/web/src/store/admin/apiServices.ts
+++ b/web/src/store/admin/apiServices.ts
@@ -22,7 +22,7 @@ interface IApiServicesState {
 
   fetch: () => Promise<void>;
   fetchSingle: (id: string) => Promise<void>;
-  create: (req: CreateApiServiceRequest) => Promise<void>;
+  create: (req: CreateApiServiceRequest) => Promise<bool>;
   resetCredentials: () => void;
 
   toggling: boolean;
@@ -117,11 +117,12 @@ export const useApiServices = create<IApiServicesState>((set, get) => ({
 
     try {
       const response = await postApiService(req);
-      set({ createdCredentials: response.credentials });
+      set({ createdCredentials: response.credentials, creating: false });
+      return true;
     } catch (err) {
       console.log("ERR: Failed to fetch services:", err);
-    } finally {
       set({ creating: false });
+      return false;
     }
   },
 }));
diff --git a/web/src/store/admin/users.ts b/web/src/store/admin/users.ts
index b984cf1..376a7fd 100644
--- a/web/src/store/admin/users.ts
+++ b/web/src/store/admin/users.ts
@@ -15,7 +15,7 @@ export interface IUsersState {
   fetchingCurrent: boolean;
 
   creating: boolean;
-  createUser: (req: CreateUserRequest) => Promise<void>;
+  createUser: (req: CreateUserRequest) => Promise<boolean>;
 
   fetchUsers: () => Promise<void>;
   fetchUser: (id: string) => Promise<void>;
@@ -36,10 +36,12 @@ export const useUsers = create<IUsersState>((set) => ({
     try {
       const response = await postUser(req);
       console.log("INFO: User has been created:", response);
+      set({ creating: false });
+      return true;
     } catch (err) {
       console.log("ERR: Failed to create user:", err);
-    } finally {
       set({ creating: false });
+      return false;
     }
   },