Damage Control: Finished

All changes have been made. You may proceed with the merge of the Login.