diff --git a/src/components/modals/invite-user-modal/InviteUserModal.tsx b/src/components/modals/invite-user-modal/InviteUserModal.tsx
index a3e591b3..7017f98b 100644
--- a/src/components/modals/invite-user-modal/InviteUserModal.tsx
+++ b/src/components/modals/invite-user-modal/InviteUserModal.tsx
@@ -25,7 +25,6 @@ import { User, UserGroup, UserInvite, UserRole, UserRoleId } from '@/models/User
 import { UsersService } from '@/services/UsersService';
 import { DeleteOutlined } from '@ant-design/icons';
 import { copyTextToClipboard, kebabCaseToTitleCase, useServerLicense } from '@/utils/Utils';
-import { getInviteMagicLink } from '@/utils/RouteUtils';
 import CreateUserGroupModal from '@/pages/users/CreateUserGroupModal';
 import { isAdminUserOrRole } from '@/utils/UserMgmtUtils';
 
@@ -440,7 +439,7 @@ export default function InviteUserModal({ isOpen, onInviteFinish, onClose, onCan
                           type="link"
                           style={{ marginRight: '1rem' }}
                           onClick={async () => {
-                            await copyTextToClipboard(getInviteMagicLink(invite.invite_code, invite.email));
+                            await copyTextToClipboard(invite.invite_url);
                             notify.success({ message: 'Invite code copied to clipboard' });
                           }}
                         >
diff --git a/src/components/modals/user-details-modal/UserDetailsModal.tsx b/src/components/modals/user-details-modal/UserDetailsModal.tsx
index c7919236..d7fa62d2 100644
--- a/src/components/modals/user-details-modal/UserDetailsModal.tsx
+++ b/src/components/modals/user-details-modal/UserDetailsModal.tsx
@@ -22,6 +22,7 @@ import { User, UserGroup, UserRole, UserRoleId } from '@/models/User';
 import { UsersService } from '@/services/UsersService';
 import { kebabCaseToTitleCase, snakeCaseToTitleCase, useServerLicense } from '@/utils/Utils';
 import { isAdminUserOrRole } from '@/utils/UserMgmtUtils';
+import { isSaasBuild } from '@/services/BaseService';
 
 interface UserdetailsModalProps {
   isOpen: boolean;
@@ -320,9 +321,37 @@ export default function UserDetailsModal({
             </Col>
           </Row>
 
-          <Row ref={addUserPasswordInputRef}>
-            <Col xs={24}>
-              <Form.Item label="Password" name="password">
+          {!isSaasBuild && (
+            <>
+              <Row ref={addUserPasswordInputRef}>
+                <Col xs={24}>
+                  <Form.Item label="Password" name="password">
+                    <Input
+                      placeholder="(unchanged)"
+                      type="password"
+                      disabled={user.auth_type === 'oauth'}
+                      title={user.auth_type === 'oauth' ? 'You cannot change the password of an OAuth user' : ''}
+                    />
+                  </Form.Item>
+                </Col>
+              </Row>
+
+              <Form.Item
+                label="Confirm Password"
+                name="confirm-password"
+                rules={[
+                  {
+                    validator(_, value) {
+                      if (value !== passwordVal) {
+                        return Promise.reject('Password must match');
+                      } else {
+                        return Promise.resolve();
+                      }
+                    },
+                  },
+                ]}
+                dependencies={['password']}
+              >
                 <Input
                   placeholder="(unchanged)"
                   type="password"
@@ -330,32 +359,8 @@ export default function UserDetailsModal({
                   title={user.auth_type === 'oauth' ? 'You cannot change the password of an OAuth user' : ''}
                 />
               </Form.Item>
-            </Col>
-          </Row>
-
-          <Form.Item
-            label="Confirm Password"
-            name="confirm-password"
-            rules={[
-              {
-                validator(_, value) {
-                  if (value !== passwordVal) {
-                    return Promise.reject('Password must match');
-                  } else {
-                    return Promise.resolve();
-                  }
-                },
-              },
-            ]}
-            dependencies={['password']}
-          >
-            <Input
-              placeholder="(unchanged)"
-              type="password"
-              disabled={user.auth_type === 'oauth'}
-              title={user.auth_type === 'oauth' ? 'You cannot change the password of an OAuth user' : ''}
-            />
-          </Form.Item>
+            </>
+          )}
 
           {isServerEE && (
             <>
diff --git a/src/pages/users/ProfilePage.tsx b/src/pages/users/ProfilePage.tsx
index 4b5d66b3..69b9c757 100644
--- a/src/pages/users/ProfilePage.tsx
+++ b/src/pages/users/ProfilePage.tsx
@@ -9,6 +9,7 @@ import { UsersService } from '@/services/UsersService';
 import { extractErrorMsg } from '@/utils/ServiceUtils';
 import { useState } from 'react';
 import { kebabCaseToTitleCase, snakeCaseToTitleCase } from '@/utils/Utils';
+import { isSaasBuild } from '@/services/BaseService';
 
 export default function ProfilePage(props: PageProps) {
   const [notify, notifyCtx] = notification.useNotification();
@@ -90,63 +91,67 @@ export default function ProfilePage(props: PageProps) {
               </Col>
             </Row>
 
-            <Row>
-              <Col xs={24}>
-                <Form.Item label="Password" name="password">
-                  <Input
-                    placeholder="(unchanged)"
-                    type="password"
-                    disabled={store.user?.auth_type === 'oauth'}
-                    title={store.user?.auth_type === 'oauth' ? 'Cannot change password of an oauth user' : ''}
-                  />
-                </Form.Item>
-              </Col>
-            </Row>
+            {!isSaasBuild && (
+              <>
+                <Row>
+                  <Col xs={24}>
+                    <Form.Item label="Password" name="password">
+                      <Input
+                        placeholder="(unchanged)"
+                        type="password"
+                        disabled={store.user?.auth_type === 'oauth'}
+                        title={store.user?.auth_type === 'oauth' ? 'Cannot change password of an oauth user' : ''}
+                      />
+                    </Form.Item>
+                  </Col>
+                </Row>
 
-            <Row>
-              <Col xs={24}>
-                <Form.Item
-                  label="Confirm Password"
-                  name="confirm-password"
-                  rules={[
-                    {
-                      validator(_, value) {
-                        if (value !== passwordVal) {
-                          return Promise.reject('Password must match');
-                        } else {
-                          return Promise.resolve();
-                        }
-                      },
-                    },
-                  ]}
-                  dependencies={['password']}
-                >
-                  <Input
-                    placeholder="(unchanged)"
-                    type="password"
-                    disabled={store.user?.auth_type === 'oauth'}
-                    title={store.user?.auth_type === 'oauth' ? 'Cannot change password of an oauth user' : ''}
-                  />
-                </Form.Item>
-              </Col>
-            </Row>
+                <Row>
+                  <Col xs={24}>
+                    <Form.Item
+                      label="Confirm Password"
+                      name="confirm-password"
+                      rules={[
+                        {
+                          validator(_, value) {
+                            if (value !== passwordVal) {
+                              return Promise.reject('Password must match');
+                            } else {
+                              return Promise.resolve();
+                            }
+                          },
+                        },
+                      ]}
+                      dependencies={['password']}
+                    >
+                      <Input
+                        placeholder="(unchanged)"
+                        type="password"
+                        disabled={store.user?.auth_type === 'oauth'}
+                        title={store.user?.auth_type === 'oauth' ? 'Cannot change password of an oauth user' : ''}
+                      />
+                    </Form.Item>
+                  </Col>
+                </Row>
 
-            <Divider />
-            <Row>
-              <Col xs={24} style={{ textAlign: 'end' }}>
-                <Form.Item>
-                  <Button
-                    type="primary"
-                    loading={isSubmitting}
-                    onClick={() => {
-                      updateUser();
-                    }}
-                  >
-                    Update Profile
-                  </Button>
-                </Form.Item>
-              </Col>
-            </Row>
+                <Divider />
+                <Row>
+                  <Col xs={24} style={{ textAlign: 'end' }}>
+                    <Form.Item>
+                      <Button
+                        type="primary"
+                        loading={isSubmitting}
+                        onClick={() => {
+                          updateUser();
+                        }}
+                      >
+                        Update Profile
+                      </Button>
+                    </Form.Item>
+                  </Col>
+                </Row>
+              </>
+            )}
           </Form>
         </Card>
       </div>
diff --git a/src/pages/users/UsersPage.tsx b/src/pages/users/UsersPage.tsx
index 74c5ef7a..f2615a9c 100644
--- a/src/pages/users/UsersPage.tsx
+++ b/src/pages/users/UsersPage.tsx
@@ -182,12 +182,7 @@ export default function UsersPage(props: PageProps) {
   }, []);
 
   const onInviteUser = useCallback(() => {
-    if (isSaasBuild) {
-      window.location = getAmuiUrl('invite-user') as any;
-      return;
-    } else {
-      setIsInviteModalOpen(true);
-    }
+    setIsInviteModalOpen(true);
   }, []);
 
   const canDeleteUser: (user: User) => [boolean, string] = useCallback(
@@ -378,44 +373,51 @@ export default function UsersPage(props: PageProps) {
             <Dropdown
               placement="bottomRight"
               menu={{
-                items: [
-                  {
-                    key: 'edit',
-                    label: 'Change Password',
-                    disabled: !canChangePassword(user)[0],
-                    title: canChangePassword(user)[0] ? canChangePassword(user)[1] : '',
-                    onClick: (ev: any) => {
-                      ev.domEvent.stopPropagation();
-                      const userClone = structuredClone(user);
-                      onEditUser(userClone);
-                    },
-                  },
-                  {
-                    key: 'delete',
-                    disabled: !canDeleteUser(user)[0],
-                    title: canDeleteUser(user)[0] ? canDeleteUser(user)[1] : '',
-                    label: 'Delete',
-                    onClick: (ev: any) => {
-                      ev.domEvent.stopPropagation();
-                      confirmDeleteUser(user);
+                items: (() => {
+                  const items = [
+                    {
+                      key: 'delete',
+                      disabled: !canDeleteUser(user)[0],
+                      title: canDeleteUser(user)[0] ? canDeleteUser(user)[1] : '',
+                      label: 'Delete',
+                      onClick: (ev: any) => {
+                        ev.domEvent.stopPropagation();
+                        confirmDeleteUser(user);
+                      },
                     },
-                  },
-                ].concat(
-                  !isSaasBuild && user.platform_role_id === 'super-admin' && store.username === user.username
-                    ? [
-                        {
-                          key: 'transfer',
-                          label: 'Transfer Super Admin Rights',
-                          disabled: false,
-                          title: '',
-                          onClick: (ev) => {
-                            ev.domEvent.stopPropagation();
-                            setIsTransferSuperAdminRightsModalOpen(true);
+                  ].concat(
+                    !isSaasBuild && user.platform_role_id === 'super-admin' && store.username === user.username
+                      ? [
+                          {
+                            key: 'transfer',
+                            label: 'Transfer Super Admin Rights',
+                            disabled: false,
+                            title: '',
+                            onClick: (ev) => {
+                              ev.domEvent.stopPropagation();
+                              setIsTransferSuperAdminRightsModalOpen(true);
+                            },
                           },
-                        },
-                      ]
-                    : [],
-                ) as MenuProps['items'],
+                        ]
+                      : [],
+                  ) as MenuProps['items'];
+
+                  if (!isSaasBuild) {
+                    items?.unshift({
+                      key: 'edit',
+                      label: 'Change Password',
+                      disabled: !canChangePassword(user)[0],
+                      title: canChangePassword(user)[0] ? canChangePassword(user)[1] : '',
+                      onClick: (ev: any) => {
+                        ev.domEvent.stopPropagation();
+                        const userClone = structuredClone(user);
+                        onEditUser(userClone);
+                      },
+                    });
+                  }
+
+                  return items;
+                })(),
               }}
             >
               <Button type="text" icon={<MoreOutlined />} />
diff --git a/src/services/BaseService.ts b/src/services/BaseService.ts
index 6ca7be62..a1a22666 100644
--- a/src/services/BaseService.ts
+++ b/src/services/BaseService.ts
@@ -1,9 +1,9 @@
-// import { ApiRoutes } from '@/constants/ApiRoutes';
-// import { User } from '@/models/User';
 import { ApiRoutes } from '@/constants/ApiRoutes';
+import { User, UserRole } from '@/models/User';
 import { useStore } from '@/store/store';
 import { truncateQueryParamsFromCurrentUrl } from '@/utils/RouteUtils';
 import axios from 'axios';
+import { GenericResponseDto } from './dtos/GenericDto';
 
 export const isSaasBuild = import.meta.env.VITE_IS_SAAS_BUILD?.toLocaleLowerCase() === 'true';
 
@@ -50,19 +50,7 @@ export async function setupTenantConfig(): Promise<void> {
 
   truncateQueryParamsFromCurrentUrl();
 
-  // let user: User | undefined;
-  // try {
-  //   user = (
-  //     await baseService.get(`${ApiRoutes.USERS}/${encodeURIComponent(username)}`, {
-  //       headers: { Authorization: `Bearer ${accessToken || useStore.getState().jwt}`, user: username },
-  //     })
-  //   ).data;
-  // } catch (err) {
-  //   console.error(err);
-  //   alert('Failed to fetch user details: ' + String(err));
-  //   return;
-  // }
-
+  // resolve server url
   let resolvedBaseUrl;
   if (baseUrl) {
     resolvedBaseUrl = baseUrl?.startsWith('https') ? `${baseUrl}/api` : `https://${baseUrl}/api`;
@@ -72,6 +60,24 @@ export async function setupTenantConfig(): Promise<void> {
   }
   axiosService.defaults.baseURL = resolvedBaseUrl;
 
+  let user: (User & { platform_role: UserRole }) | undefined;
+  let userPlatformRole: UserRole | undefined;
+  try {
+    user = (
+      await axiosService.get<GenericResponseDto<User & { platform_role: UserRole }>>(
+        `${ApiRoutes.USERS_V1}?username=${encodeURIComponent(username || (window?.localStorage?.getItem(NMUI_USERNAME_LOCALSTORAGE_KEY) ?? ''))}`,
+        {
+          headers: {
+            Authorization: `Bearer ${accessToken || (window?.localStorage?.getItem(NMUI_ACCESS_TOKEN_LOCALSTORAGE_KEY) ?? '')}`,
+          },
+        },
+      )
+    ).data.Response;
+    userPlatformRole = user?.platform_role;
+  } catch (err) {
+    console.error(err);
+  }
+
   if (accessToken) {
     window?.localStorage?.setItem(NMUI_ACCESS_TOKEN_LOCALSTORAGE_KEY, accessToken);
   }
@@ -87,6 +93,12 @@ export async function setupTenantConfig(): Promise<void> {
   if (amuiUserId) {
     window?.localStorage?.setItem(NMUI_AMUI_USER_ID_LOCALSTORAGE_KEY, amuiUserId);
   }
+  if (user) {
+    window?.localStorage?.setItem(NMUI_USER_LOCALSTORAGE_KEY, JSON.stringify(user));
+  }
+  if (userPlatformRole) {
+    window?.localStorage?.setItem(NMUI_USER_PLATFORM_ROLE_LOCALSTORAGE_KEY, JSON.stringify(userPlatformRole));
+  }
 
   useStore.getState().setStore({
     baseUrl: resolvedBaseUrl,
@@ -97,8 +109,9 @@ export async function setupTenantConfig(): Promise<void> {
     username: username || (window?.localStorage?.getItem(NMUI_USERNAME_LOCALSTORAGE_KEY) ?? ''),
     amuiUserId: amuiUserId || (window?.localStorage?.getItem(NMUI_AMUI_USER_ID_LOCALSTORAGE_KEY) ?? ''),
     isNewTenant: isNewTenant,
-    // user,
-    // userPlatformRole,
+    user: user || JSON.parse(window?.localStorage?.getItem(NMUI_USER_LOCALSTORAGE_KEY) ?? '{}'),
+    userPlatformRole:
+      userPlatformRole || JSON.parse(window?.localStorage?.getItem(NMUI_USER_PLATFORM_ROLE_LOCALSTORAGE_KEY) ?? '{}'),
   });
 }
 
diff --git a/src/store/auth.ts b/src/store/auth.ts
index ffb50856..b83fd077 100644
--- a/src/store/auth.ts
+++ b/src/store/auth.ts
@@ -10,7 +10,6 @@ import {
   NMUI_USERNAME_LOCALSTORAGE_KEY,
   NMUI_USER_LOCALSTORAGE_KEY,
   NMUI_USER_PLATFORM_ROLE_LOCALSTORAGE_KEY,
-  isSaasBuild,
 } from '@/services/BaseService';
 import { isValidJwt } from '@/utils/Utils';
 
@@ -48,12 +47,7 @@ const createAuthSlice: StateCreator<IAuthSlice, [], [], IAuthSlice> = (set, get)
 
   isLoggedIn() {
     // TODO: fix username retrieval for SaaS
-    return (
-      !!get().baseUrl &&
-      !!get().jwt &&
-      isValidJwt(get().jwt || '') &&
-      (!isSaasBuild ? !!get().user && !!get().userPlatformRole : true)
-    );
+    return !!get().baseUrl && !!get().jwt && isValidJwt(get().jwt || '') && !!get().user && !!get().userPlatformRole;
   },
   setStore(config) {
     set(config);
diff --git a/src/utils/RouteUtils.ts b/src/utils/RouteUtils.ts
index dd218234..931b0c17 100644
--- a/src/utils/RouteUtils.ts
+++ b/src/utils/RouteUtils.ts
@@ -262,17 +262,3 @@ export function reloadNmuiWithVersion(uiVersion = '') {
 export function getNetmakerUiHost() {
   return window?.location?.host || '';
 }
-
-/**
- * Get the magic link for the invite code
- *
- * @param inviteCode
- * @param username
- * @returns invite code magic link
- */
-export function getInviteMagicLink(inviteCode: string, username: string): string {
-  if (window?.location?.protocol.includes('https')) {
-    return `https://${getNetmakerUiHost()}/invite?invite_code=${encodeURIComponent(inviteCode)}&email=${encodeURIComponent(username)}`;
-  }
-  return `http://${getNetmakerUiHost()}/invite?invite_code=${encodeURIComponent(inviteCode)}&email=${encodeURIComponent(username)}`;
-}