Fixed name and problems after registration