Bug fixes in registration screen