Hotfix for broken update button. Authors: ghfranzini nmcmahon1215
fixed merge conflicts, minor hotfix for activities log author:@pilord12