more user fixes