fixed problem with a setting and fixed devise to allow username
fixed typo