diff --git a/builder/azure/arm/azure_client.go b/builder/azure/arm/azure_client.go
index 7e4f5324e..f8477d235 100644
--- a/builder/azure/arm/azure_client.go
+++ b/builder/azure/arm/azure_client.go
@@ -122,7 +122,7 @@ func byConcatDecorators(decorators ...autorest.RespondDecorator) autorest.Respon
 }
 
 func NewAzureClient(subscriptionID, resourceGroupName, storageAccountName string,
-	cloud *azure.Environment, tenantID string, isDeviceLogin bool,
+	cloud *azure.Environment,
 	servicePrincipalToken, servicePrincipalTokenVault *adal.ServicePrincipalToken) (*AzureClient, error) {
 
 	var azureClient = &AzureClient{}
diff --git a/builder/azure/arm/builder.go b/builder/azure/arm/builder.go
index 8f4b66aaa..4575ede15 100644
--- a/builder/azure/arm/builder.go
+++ b/builder/azure/arm/builder.go
@@ -83,8 +83,6 @@ func (b *Builder) Run(ui packer.Ui, hook packer.Hook, cache packer.Cache) (packe
 		b.config.ResourceGroupName,
 		b.config.StorageAccount,
 		b.config.cloudEnvironment,
-		b.config.TenantID,
-		b.config.useDeviceLogin,
 		spnCloud,
 		spnKeyVault)
 	if err != nil {
diff --git a/builder/azure/common/devicelogin.go b/builder/azure/common/devicelogin.go
index ea87767ca..ad4a2ce36 100644
--- a/builder/azure/common/devicelogin.go
+++ b/builder/azure/common/devicelogin.go
@@ -203,7 +203,7 @@ func validateToken(env string, token *adal.ServicePrincipalToken) error {
 	err := token.EnsureFresh()
 
 	if err != nil {
-		return fmt.Errorf("%s token validity check failed: %v", env,err)
+		return fmt.Errorf("%s token validity check failed: %v", env, err)
 	}
 	return nil
 }
diff --git a/vendor/github.com/Azure/go-autorest/autorest/azure/environments.go b/vendor/github.com/Azure/go-autorest/autorest/azure/environments.go
index b6b4010b1..7e41f7fd9 100644
--- a/vendor/github.com/Azure/go-autorest/autorest/azure/environments.go
+++ b/vendor/github.com/Azure/go-autorest/autorest/azure/environments.go
@@ -67,7 +67,7 @@ var (
 		ResourceManagerEndpoint:      "https://management.azure.com/",
 		ActiveDirectoryEndpoint:      "https://login.microsoftonline.com/",
 		GalleryEndpoint:              "https://gallery.azure.com/",
-		KeyVaultEndpoint:             "https://vault.azure.net",
+		KeyVaultEndpoint:             "https://vault.azure.net/",
 		GraphEndpoint:                "https://graph.windows.net/",
 		ServiceBusEndpoint:           "https://servicebus.windows.net/",
 		BatchManagementEndpoint:      "https://batch.core.windows.net/",