additional user fixes