Fixed callback url generation