diff --git a/.env.example b/.env.example
index 5202ca4..504aeba 100644
--- a/.env.example
+++ b/.env.example
@@ -3,4 +3,5 @@ VUE_APP_I18N_LOCALE=en
 VUE_APP_I18N_FALLBACK_LOCALE=en
 VUE_APP_LOCALES={"en": "English", "ja": "日本語", "es": "Español"}
 VUE_APP_CURRENCY_FORMATS={"en": {"currency": {"style": "currency","currency": "USD"}}, "ja": {"currency": {"style": "currency", "currency": "JPY"}}, "es": {"currency": {"style": "currency","currency": "ESP"}}}
-VUE_APP_DEFAULT_ALIAS=
\ No newline at end of file
+VUE_APP_DEFAULT_ALIAS=
+VUE_APP_MAARG_LOGIN=["order-routing"]
\ No newline at end of file
diff --git a/src/assets/images/OrderRouting.svg b/src/assets/images/OrderRouting.svg
new file mode 100644
index 0000000..a2b2b82
--- /dev/null
+++ b/src/assets/images/OrderRouting.svg
@@ -0,0 +1,23 @@
+<svg width="230" height="230" viewBox="0 0 230 230" fill="none" xmlns="http://www.w3.org/2000/svg">
+<g filter="url(#filter0_dd_35699_66390)">
+<path d="M35.9819 69.3789L115 23.7577L194.018 69.3789V160.621L115 206.242L35.9819 160.621V69.3789Z" stroke="#EC2227" stroke-width="2.24609"/>
+</g>
+<path d="M167.626 115.49C167.626 86.7129 144.278 63.3652 115.501 63.3652C86.7236 63.3652 63.376 86.7129 63.376 115.49C63.376 144.268 86.7236 167.615 115.501 167.615C144.278 167.615 167.626 144.268 167.626 115.49Z" stroke="#92949C" stroke-width="6.4306" stroke-miterlimit="10"/>
+<path d="M110.02 101.283L110.021 101.283L141.839 88.5555L141.202 86.9631L141.839 88.5553C141.922 88.5221 142.013 88.514 142.101 88.5319C142.188 88.5499 142.269 88.5932 142.332 88.6564C142.395 88.7197 142.438 88.8001 142.456 88.8877C142.474 88.9753 142.466 89.0663 142.433 89.1493L142.433 89.1497L129.706 120.968L129.706 120.968C128.918 122.937 127.738 124.726 126.238 126.226C124.738 127.726 122.949 128.906 120.98 129.693L120.98 129.693L89.1619 142.421L89.1615 142.421C89.0785 142.454 88.9875 142.462 88.8999 142.444C88.8123 142.426 88.7319 142.383 88.6686 142.32C88.6054 142.256 88.5621 142.176 88.5441 142.088C88.5262 142.001 88.5343 141.91 88.5675 141.827L88.5677 141.826L101.295 110.008L101.295 110.008C102.083 108.039 103.262 106.25 104.762 104.75C106.262 103.25 108.051 102.07 110.02 101.283ZM110.928 122.332C112.281 123.236 113.872 123.719 115.5 123.719C117.683 123.719 119.777 122.851 121.32 121.308C122.864 119.764 123.731 117.671 123.731 115.488C123.731 113.86 123.248 112.269 122.344 110.915C121.439 109.562 120.154 108.507 118.65 107.884C117.146 107.261 115.491 107.098 113.895 107.416C112.298 107.733 110.831 108.517 109.68 109.668C108.529 110.819 107.745 112.286 107.428 113.882C107.11 115.479 107.273 117.134 107.896 118.638C108.519 120.142 109.574 121.427 110.928 122.332Z" fill="#EC2227" stroke="#EC2227" stroke-width="3.43"/>
+<defs>
+<filter id="filter0_dd_35699_66390" x="25.8745" y="13.4766" width="178.251" height="203.047" filterUnits="userSpaceOnUse" color-interpolation-filters="sRGB">
+<feFlood flood-opacity="0" result="BackgroundImageFix"/>
+<feColorMatrix in="SourceAlpha" type="matrix" values="0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 127 0" result="hardAlpha"/>
+<feOffset dx="-2.24609" dy="-2.24609"/>
+<feGaussianBlur stdDeviation="3.36914"/>
+<feColorMatrix type="matrix" values="0 0 0 0 1 0 0 0 0 1 0 0 0 0 1 0 0 0 1 0"/>
+<feBlend mode="normal" in2="BackgroundImageFix" result="effect1_dropShadow_35699_66390"/>
+<feColorMatrix in="SourceAlpha" type="matrix" values="0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 127 0" result="hardAlpha"/>
+<feOffset dx="2.24609" dy="2.24609"/>
+<feGaussianBlur stdDeviation="3.36914"/>
+<feColorMatrix type="matrix" values="0 0 0 0 0.682353 0 0 0 0 0.682353 0 0 0 0 0.752941 0 0 0 0.4 0"/>
+<feBlend mode="normal" in2="effect1_dropShadow_35699_66390" result="effect2_dropShadow_35699_66390"/>
+<feBlend mode="normal" in="SourceGraphic" in2="effect2_dropShadow_35699_66390" result="shape"/>
+</filter>
+</defs>
+</svg>
diff --git a/src/locales/en.json b/src/locales/en.json
index 64ff952..b8ef5a3 100644
--- a/src/locales/en.json
+++ b/src/locales/en.json
@@ -5,6 +5,7 @@
   "Logout": "Logout",
   "Logging out...": "Logging out...",
   "Next": "Next",
+  "Not configured": "Not configured",
   "OMS": "OMS",
   "Password": "Password",
   "Please fill in the OMS": "Please fill in the OMS",
@@ -12,5 +13,6 @@
   "Processing": "Processing",
   "Something went wrong while login. Please contact administrator.": "Something went wrong while login. Please contact administrator.",
   "Sorry, your username or password is incorrect. Please try again.": "Sorry, your username or password is incorrect. Please try again.",
+  "This application is not enabled for your account": "This application is not enabled for your account",
   "Username": "Username"
 }
\ No newline at end of file
diff --git a/src/store/auth.ts b/src/store/auth.ts
index f0e092a..04f07e5 100644
--- a/src/store/auth.ts
+++ b/src/store/auth.ts
@@ -14,7 +14,8 @@ export const useAuthStore = defineStore('authStore', {
       value: '',
       expiration: undefined
     },
-    redirectUrl: ''
+    redirectUrl: '',
+    maargOms: ''
   }),
   getters: {
     isAuthenticated: (state) => {
@@ -32,6 +33,7 @@ export const useAuthStore = defineStore('authStore', {
       return baseURL.startsWith('http') ? baseURL.includes('/api') ? baseURL : `${baseURL}/api/` : `https://${baseURL}.hotwax.io/api/`
     },
     getRedirectUrl: (state) => state.redirectUrl,
+    getMaargOms: (state) => state.maargOms
   },
   actions: {
     setOMS(oms: string) {
@@ -103,6 +105,7 @@ export const useAuthStore = defineStore('authStore', {
         expiration: undefined
       }
       this.redirectUrl = ''
+      this.maargOms = ''
       updateToken('');
       emitter.emit('dismissLoader')
     },
@@ -115,6 +118,9 @@ export const useAuthStore = defineStore('authStore', {
     },
     async setCurrent(current: any) {
       this.current = current
+    },
+    async setMaargInstance(url: string) {
+      this.maargOms = url
     }
   },
   persist: true
diff --git a/src/util/index.ts b/src/util/index.ts
index 767643e..945221d 100644
--- a/src/util/index.ts
+++ b/src/util/index.ts
@@ -10,4 +10,9 @@ const showToast = async (message: string) => {
   return toast.present();
 }
 
-export { showToast }
\ No newline at end of file
+const isMaargLogin = (handle: string) => {
+  const maargLoginApps = JSON.parse(process.env.VUE_APP_MAARG_LOGIN ? process.env.VUE_APP_MAARG_LOGIN : [])
+  return maargLoginApps.some((appName: string) => handle.includes(appName))
+}
+
+export { isMaargLogin, showToast }
\ No newline at end of file
diff --git a/src/views/Home.vue b/src/views/Home.vue
index 25c5ac9..8ae0a9e 100644
--- a/src/views/Home.vue
+++ b/src/views/Home.vue
@@ -36,17 +36,20 @@
         <div class="type" v-for="category in Object.keys(appCategory)" :key="category">
           <h3>{{ category }}</h3>
           <div class="apps">
-            <ion-card button class="app" v-for="app in appCategory[category]" :key="app.handle" :href="scheme + app.handle + domain + (authStore.isAuthenticated ? `/login?oms=${authStore.getOMS.startsWith('http') ? authStore.getOMS.includes('/api') ? authStore.getOMS : `${authStore.getOMS}/api/` : authStore.getOMS}&token=${authStore.token.value}&expirationTime=${authStore.token.expiration}` : '')">
+            <ion-card button class="app" v-for="app in appCategory[category]" :key="app.handle" :disabled="authStore.isAuthenticated && isMaargLogin(app.handle) && !authStore.getMaargOms" @click.stop="generateAppLink(app)">
               <div class="app-icon ion-padding">
                 <img :src="app.resource" />
               </div>
               <ion-card-header class="app-content">
                 <ion-card-title color="text-medium">{{ app.name }}</ion-card-title>
-                <ion-buttons class="app-links">
-                  <ion-button color="medium" :href="scheme + app.handle + devHandle + domain + (authStore.isAuthenticated ? `/login?oms=${authStore.getOMS.startsWith('http') ? authStore.getOMS.includes('/api') ? authStore.getOMS : `${authStore.getOMS}/api/` : authStore.getOMS}&token=${authStore.token.value}&expirationTime=${authStore.token.expiration}` : '')">
+                <ion-badge class="ion-margin" color="medium" v-if="authStore.isAuthenticated && isMaargLogin(app.handle) && !authStore.getMaargOms">
+                  {{ translate("Not configured") }}
+                </ion-badge>
+                <ion-buttons class="app-links" v-else>
+                  <ion-button color="medium" @click.stop="generateAppLink(app, devHandle)">
                     <ion-icon slot="icon-only" :icon="codeWorkingOutline" />
                   </ion-button>
-                  <ion-button color="medium" :href="scheme + app.handle + uatHandle + domain + (authStore.isAuthenticated ? `/login?oms=${authStore.getOMS.startsWith('http') ? authStore.getOMS.includes('/api') ? authStore.getOMS : `${authStore.getOMS}/api/` : authStore.getOMS}&token=${authStore.token.value}&expirationTime=${authStore.token.expiration}` : '')">
+                  <ion-button color="medium" @click.stop="generateAppLink(app, uatHandle)">
                     <ion-icon slot="icon-only" :icon="shieldHalfOutline" />
                   </ion-button>
                 </ion-buttons>
@@ -60,7 +63,8 @@
 </template>
 
 <script lang="ts">
-import { 
+import {
+  IonBadge,
   IonButton,
   IonButtons,
   IonCard,
@@ -86,10 +90,13 @@ import {
 import { useAuthStore } from '@/store/auth';
 import { useRouter } from "vue-router";
 import { goToOms } from '@hotwax/dxp-components'
+import { isMaargLogin } from '@/util';
+import { translate } from '@/i18n';
 
 export default defineComponent({
   name: 'Home',
   components: {
+    IonBadge,
     IonButton,
     IonButtons,
     IonCard,
@@ -125,6 +132,10 @@ export default defineComponent({
       if (this.authStore.isAuthenticated) {
         await this.authStore.logout()
       }
+    },
+    generateAppLink(app: any, appEnvironment = '') {
+      const oms = isMaargLogin(app.handle) ? this.authStore.getMaargOms : this.authStore.getOMS;
+      window.location.href = this.scheme + app.handle + appEnvironment + this.domain + (this.authStore.isAuthenticated ? `/login?oms=${oms.startsWith('http') ? isMaargLogin(app.handle) ? oms : oms.includes('/api') ? oms : `${oms}/api/` : oms}&token=${this.authStore.token.value}&expirationTime=${this.authStore.token.expiration}${isMaargLogin(this.authStore.getRedirectUrl) ? '&omsRedirectionUrl=' + this.authStore.getOMS : ''}` : '')
     }
   },
   setup() {
@@ -175,7 +186,7 @@ export default defineComponent({
       handle: 'import',
       name: 'Import',
       resource: require('../assets/images/Import.svg'),
-      type: 'Workflow'
+      type: 'Administration'
     }, {
       handle: 'users',
       name: 'Users',
@@ -186,6 +197,11 @@ export default defineComponent({
       name: 'Facilities',
       resource: require('../assets/images/Facilities.svg'),
       type: 'Administration'
+    }, {
+      handle: 'order-routing',
+      name: 'Order Routing',
+      resource: require('../assets/images/OrderRouting.svg'),
+      type: 'Workflow'
     }]
 
     const appCategory = appInfo.reduce((obj: any, app: any) => {
@@ -210,6 +226,7 @@ export default defineComponent({
       devHandle,
       domain,
       goToOms,
+      isMaargLogin,
       lockClosedOutline,
       hardwareChipOutline,
       openOutline,
@@ -218,6 +235,7 @@ export default defineComponent({
       router,
       scheme,
       shieldHalfOutline,
+      translate,
       uatHandle
     }
   }
@@ -286,6 +304,7 @@ export default defineComponent({
   ion-card-header {
     text-align: center;
     padding-bottom: 0;
+    align-items: center;
   }
 
   ion-card-title {
@@ -296,6 +315,11 @@ export default defineComponent({
   .app-links {
     justify-content: center;
   }
+
+  .card-disabled {
+    opacity: 0.6;
+  }
+
   @media only screen and (min-width: 768px) {
     .app:hover {
       box-shadow: rgb(0 0 0 / 26%) 0px 3px 17px -2px, rgb(0 0 0 / 14%) 0px 2px 6px 0px, rgb(0 0 0 / 12%) 0px 1px 12px 0px;
diff --git a/src/views/Login.vue b/src/views/Login.vue
index 25ebb4c..16c652d 100644
--- a/src/views/Login.vue
+++ b/src/views/Login.vue
@@ -73,7 +73,7 @@ import Logo from '@/components/Logo.vue';
 import { arrowForwardOutline, gridOutline } from 'ionicons/icons'
 import { UserService } from "@/services/UserService";
 import { translate } from "@/i18n";
-import { showToast } from "@/util";
+import { isMaargLogin, showToast } from "@/util";
 import { hasError } from "@hotwax/oms-api";
 
 export default defineComponent({
@@ -128,7 +128,8 @@ export default defineComponent({
       // logout from Launchpad if logged out from the app
       if (this.$route.query?.isLoggedOut === 'true') {
         // We will already mark the user as unuauthorised when log-out from the app
-        this.authStore.logout({ isUserUnauthorised: true })
+        // For the case of apps using maarg login, we will call the logout api from launchpad
+        isMaargLogin(this.$route.query.redirectUrl as string) ? await this.authStore.logout() : await this.authStore.logout({ isUserUnauthorised: true })
       }
 
       // fetch login options only if OMS is there as API calls require OMS
@@ -154,8 +155,7 @@ export default defineComponent({
       // if a session is already active, login directly in the app
       if (this.authStore.isAuthenticated) {
         if(this.authStore.getRedirectUrl) {
-          const omsUrl = this.authStore.oms.startsWith('http') ? this.authStore.oms.includes('/api') ? this.authStore.oms : `${this.authStore.oms}/api/` : this.authStore.oms
-          window.location.href = `${this.authStore.getRedirectUrl}?oms=${omsUrl}&token=${this.authStore.token.value}&expirationTime=${this.authStore.token.expiration}`
+          this.generateRedirectionLink();
         } else {
           this.router.push('/')
         }
@@ -229,6 +229,7 @@ export default defineComponent({
         const resp = await UserService.checkLoginOptions()
         if (!hasError(resp)) {
           this.loginOption = resp.data
+          await this.authStore.setMaargInstance(resp.data.maargInstanceUrl)
         }
       } catch (error) {
         console.error(error)
@@ -244,8 +245,7 @@ export default defineComponent({
       try {
         await this.authStore.login(username.trim(), password)
         if (this.authStore.getRedirectUrl) {
-          const omsUrl = this.authStore.oms.startsWith('http') ? this.authStore.oms.includes('/api') ? this.authStore.oms : `${this.authStore.oms}/api/` : this.authStore.oms
-          window.location.href = `${this.authStore.getRedirectUrl}?oms=${omsUrl}&token=${this.authStore.token.value}&expirationTime=${this.authStore.token.expiration}`
+          this.generateRedirectionLink()
         } else {
           // All the failure cases are handled in action, if then block is executing, login is successful
           this.username = ''
@@ -261,8 +261,7 @@ export default defineComponent({
         const { token, expirationTime } = this.$route.query as any
         await this.authStore.samlLogin(token, expirationTime)
         if (this.authStore.getRedirectUrl) {
-          const omsUrl = this.authStore.oms.startsWith('http') ? this.authStore.oms.includes('/api') ? this.authStore.oms : `${this.authStore.oms}/api/` : this.authStore.oms
-          window.location.href = `${this.authStore.getRedirectUrl}?oms=${omsUrl}&token=${this.authStore.token.value}&expirationTime=${this.authStore.token.expiration}`
+          this.generateRedirectionLink();
         } else {
           this.router.push('/')
         }
@@ -274,8 +273,13 @@ export default defineComponent({
     async basicLogin() {
       try {
         const { oms, token, expirationTime } = this.$route.query as any
+        // Clear the previously stored oms and token when having oms and token in the URL
+        await this.authStore.setToken('', '')
         await this.authStore.setOMS(oms);
 
+        // checking for login options as we need to get maarg instance URL for accessing specific apps
+        await this.fetchLoginOptions()
+
         // Setting token previous to getting user-profile, if not then the client method honors the state token
         await this.authStore.setToken(token, expirationTime)
 
@@ -286,6 +290,20 @@ export default defineComponent({
         console.error("error: ", error);
       }
       this.router.replace('/')
+    },
+    generateRedirectionLink() {
+      let omsUrl = ''
+      if(isMaargLogin(this.authStore.getRedirectUrl)) {
+        if(this.authStore.getMaargOms) omsUrl = this.authStore.getMaargOms
+        else {
+          showToast(translate("This application is not enabled for your account"))
+          this.router.push("/")
+          return;
+        }
+      }
+
+      omsUrl = omsUrl ? omsUrl : this.authStore.oms.startsWith('http') ? this.authStore.oms.includes('/api') ? this.authStore.oms : `${this.authStore.oms}/api/` : this.authStore.oms
+      window.location.href = `${this.authStore.getRedirectUrl}?oms=${omsUrl}&token=${this.authStore.token.value}&expirationTime=${this.authStore.token.expiration}${isMaargLogin(this.authStore.getRedirectUrl) ? '&omsRedirectionUrl=' + this.authStore.oms : ''}`
     }
   },
   setup () {