Merge "Add Emergency info and Add user when locked to account dashboard."