diff --git a/runtimes/azure-client-authentication/src/main/java/com/microsoft/azure/credentials/ApplicationTokenCredentials.java b/runtimes/azure-client-authentication/src/main/java/com/microsoft/azure/credentials/ApplicationTokenCredentials.java
index 48b4a061018e..dc5ef9dc7d3b 100644
--- a/runtimes/azure-client-authentication/src/main/java/com/microsoft/azure/credentials/ApplicationTokenCredentials.java
+++ b/runtimes/azure-client-authentication/src/main/java/com/microsoft/azure/credentials/ApplicationTokenCredentials.java
@@ -76,7 +76,9 @@ private enum CredentialSettings {
         /** The base URL to the current Azure environment. */
         BASE_URL("baseURL"),
         /** The URL to Active Directory authentication. */
-        AUTH_URL("authURL");
+        AUTH_URL("authURL"),
+        /** The URL to Active Directory Graph. */
+        GRAPH_URL("graphURL");
 
         /** The name of the key in the properties file. */
         private final String name;
@@ -143,6 +145,7 @@ public static ApplicationTokenCredentials fromFile(File credentialsFile) throws
         final String mgmtUri = authSettings.getProperty(CredentialSettings.MANAGEMENT_URI.toString());
         final String authUrl = authSettings.getProperty(CredentialSettings.AUTH_URL.toString());
         final String baseUrl = authSettings.getProperty(CredentialSettings.BASE_URL.toString());
+        final String graphUrl = authSettings.getProperty(CredentialSettings.GRAPH_URL.toString());
         final String defaultSubscriptionId = authSettings.getProperty(CredentialSettings.SUBSCRIPTION_ID.toString());
 
         return new ApplicationTokenCredentials(
@@ -153,7 +156,7 @@ public static ApplicationTokenCredentials fromFile(File credentialsFile) throws
                     authUrl,
                     mgmtUri,
                     baseUrl,
-                    "https://graph.windows.net/") // TODO: cred file should contain GRAPH endpoint
+                    graphUrl)
                 ).withDefaultSubscriptionId(defaultSubscriptionId);
     }