Fix when logging in with short barcode to properly handle when barcode changes