JOJ14: More space for buttons, link email for admin includes server