Login class changes

Small changes