positioning of signed on users
merger conflict fixed