Improve BPassword and BPasswordWidget