Fix BPassword and BPasswordWidget