Merge "Add margin between password entry and error text"