Fix admin login and deconflict inventory functions admin and customer se...

...rvices