Fixed Registration Panel and added some more checks