Fix double user entries