Username Pass bug improved