Override user ID, bugfixes