Capitalization Complete/ Password Fix

TODO: 2nd degree mangling