some more user fixes, not working