Couple more user syncing conflict bug fixes
Couple more user syncing conflict bug fixes

tomnatt/libraries.io,abrophy/libraries.io,librariesio/libraries.io,librariesio/libraries.io,abrophy/libraries.io,abrophy/libraries.io,tomnatt/libraries.io,tomnatt/libraries.io,librariesio/libraries.io,librariesio/libraries.io