Updated layout to pass features
Changed check for invalid password