More user fixes