ACF-39: Merge terms and login