Adding user following minus the email and images production fixes