Add site name and improve label at register