Add password and username validation