improved input patterns, added user name support