diff --git a/packages/cue/bh/azure/azure.cue b/packages/cue/bh/azure/azure.cue
index e7201cd87..4101f0aef 100644
--- a/packages/cue/bh/azure/azure.cue
+++ b/packages/cue/bh/azure/azure.cue
@@ -276,6 +276,7 @@ Properties: [
 	MFAEnabled,
 	License,
 	Licenses,
+	LoginURL,
 	MFAEnforced,
 	UserPrincipalName,
 	IsAssignableToRole,
diff --git a/packages/go/graphschema/azure/azure.go b/packages/go/graphschema/azure/azure.go
index f8c3ab457..787ee392e 100644
--- a/packages/go/graphschema/azure/azure.go
+++ b/packages/go/graphschema/azure/azure.go
@@ -101,7 +101,6 @@ const (
 	AppOwnerOrganizationID  Property = "appownerorganizationid"
 	AppDescription          Property = "appdescription"
 	AppDisplayName          Property = "appdisplayname"
-	LoginURL                Property = "loginurl"
 	ServicePrincipalType    Property = "serviceprincipaltype"
 	UserType                Property = "usertype"
 	TenantID                Property = "tenantid"
@@ -124,6 +123,7 @@ const (
 	MFAEnabled              Property = "mfaenabled"
 	License                 Property = "license"
 	Licenses                Property = "licenses"
+	LoginURL                Property = "loginurl"
 	MFAEnforced             Property = "mfaenforced"
 	UserPrincipalName       Property = "userprincipalname"
 	IsAssignableToRole      Property = "isassignabletorole"
@@ -133,7 +133,7 @@ const (
 )
 
 func AllProperties() []Property {
-	return []Property{AppOwnerOrganizationID, AppDescription, AppDisplayName, LoginURL, ServicePrincipalType, UserType, TenantID, ServicePrincipalID, ServicePrincipalNames, OperatingSystemVersion, TrustType, IsBuiltIn, AppID, AppRoleID, DeviceID, NodeResourceGroupID, OnPremID, OnPremSyncEnabled, SecurityEnabled, SecurityIdentifier, EnableRBACAuthorization, Scope, Offer, MFAEnabled, License, Licenses, MFAEnforced, UserPrincipalName, IsAssignableToRole, PublisherDomain, SignInAudience, RoleTemplateID}
+	return []Property{AppOwnerOrganizationID, AppDescription, AppDisplayName, ServicePrincipalType, UserType, TenantID, ServicePrincipalID, ServicePrincipalNames, OperatingSystemVersion, TrustType, IsBuiltIn, AppID, AppRoleID, DeviceID, NodeResourceGroupID, OnPremID, OnPremSyncEnabled, SecurityEnabled, SecurityIdentifier, EnableRBACAuthorization, Scope, Offer, MFAEnabled, License, Licenses, LoginURL, MFAEnforced, UserPrincipalName, IsAssignableToRole, PublisherDomain, SignInAudience, RoleTemplateID}
 }
 func ParseProperty(source string) (Property, error) {
 	switch source {
@@ -143,8 +143,6 @@ func ParseProperty(source string) (Property, error) {
 		return AppDescription, nil
 	case "appdisplayname":
 		return AppDisplayName, nil
-	case "loginurl":
-		return LoginURL, nil
 	case "serviceprincipaltype":
 		return ServicePrincipalType, nil
 	case "usertype":
@@ -189,6 +187,8 @@ func ParseProperty(source string) (Property, error) {
 		return License, nil
 	case "licenses":
 		return Licenses, nil
+	case "loginurl":
+		return LoginURL, nil
 	case "mfaenforced":
 		return MFAEnforced, nil
 	case "userprincipalname":
@@ -213,8 +213,6 @@ func (s Property) String() string {
 		return string(AppDescription)
 	case AppDisplayName:
 		return string(AppDisplayName)
-	case LoginURL:
-		return string(LoginURL)
 	case ServicePrincipalType:
 		return string(ServicePrincipalType)
 	case UserType:
@@ -259,6 +257,8 @@ func (s Property) String() string {
 		return string(License)
 	case Licenses:
 		return string(Licenses)
+	case LoginURL:
+		return string(LoginURL)
 	case MFAEnforced:
 		return string(MFAEnforced)
 	case UserPrincipalName:
@@ -283,8 +283,6 @@ func (s Property) Name() string {
 		return "App Description"
 	case AppDisplayName:
 		return "App Display Name"
-	case LoginURL:
-		return "Login URL"
 	case ServicePrincipalType:
 		return "Service Principal Type"
 	case UserType:
@@ -329,6 +327,8 @@ func (s Property) Name() string {
 		return "License"
 	case Licenses:
 		return "Licenses"
+	case LoginURL:
+		return "Login URL"
 	case MFAEnforced:
 		return "MFA Enforced"
 	case UserPrincipalName:
diff --git a/packages/javascript/bh-shared-ui/src/graphSchema.ts b/packages/javascript/bh-shared-ui/src/graphSchema.ts
index 095d8c653..133b290f3 100644
--- a/packages/javascript/bh-shared-ui/src/graphSchema.ts
+++ b/packages/javascript/bh-shared-ui/src/graphSchema.ts
@@ -886,7 +886,6 @@ export enum AzureKindProperties {
     AppOwnerOrganizationID = 'appownerorganizationid',
     AppDescription = 'appdescription',
     AppDisplayName = 'appdisplayname',
-    LoginURL = 'loginurl',
     ServicePrincipalType = 'serviceprincipaltype',
     UserType = 'usertype',
     TenantID = 'tenantid',
@@ -909,6 +908,7 @@ export enum AzureKindProperties {
     MFAEnabled = 'mfaenabled',
     License = 'license',
     Licenses = 'licenses',
+    LoginURL = 'loginurl',
     MFAEnforced = 'mfaenforced',
     UserPrincipalName = 'userprincipalname',
     IsAssignableToRole = 'isassignabletorole',
@@ -924,8 +924,6 @@ export function AzureKindPropertiesToDisplay(value: AzureKindProperties): string
             return 'App Description';
         case AzureKindProperties.AppDisplayName:
             return 'App Display Name';
-        case AzureKindProperties.LoginURL:
-            return 'Login URL';
         case AzureKindProperties.ServicePrincipalType:
             return 'Service Principal Type';
         case AzureKindProperties.UserType:
@@ -970,6 +968,8 @@ export function AzureKindPropertiesToDisplay(value: AzureKindProperties): string
             return 'License';
         case AzureKindProperties.Licenses:
             return 'Licenses';
+        case AzureKindProperties.LoginURL:
+            return 'Login URL';
         case AzureKindProperties.MFAEnforced:
             return 'MFA Enforced';
         case AzureKindProperties.UserPrincipalName: