Add missing message and tweak user right message

Change-Id: I657c6fc3bd91bca01bd8b681ab307907731fe8df