Added validation and devise name tweak