Front end merge with user_setup