Update with changes for Phonetool 2.6-16

Fixes bug 589: Phonetool shows white screen after changing password