bugfixes in user link handling