Fixed db and AzureAccountService calls