-Administrator pop-up method changed to take String variable and return boolean.
Merge origin/master