Shop and register bugfix