Merge tag 'v2.0.1' into fiksgatami-dev-v2

1 files changed, 2 insertions, 2 deletions

diff --git a/perllib/FixMyStreet/App/Controller/Admin.pm b/perllib/FixMyStreet/App/Controller/Admin.pm
index e91597bb0..bbdf449aa 100644
--- a/perllib/FixMyStreet/App/Controller/Admin.pm
+++ b/perllib/FixMyStreet/App/Controller/Admin.pm
@@ -129,7 +129,7 @@ sub index : Path : Args(0) {
 
 sub config_page : Path( 'config' ) : Args(0) {
     my ($self, $c) = @_;
-    my $dir = $c->stash->{additional_template_paths}->[0];
+    my $dir = FixMyStreet->path_to();
     my $git_version = `cd $dir && git describe --tags`;
     chomp $git_version;
     $c->stash(
@@ -1377,7 +1377,7 @@ sub user_edit : Path('user_edit') : Args(1) {
     }
 
     if ( $user->from_body ) {
-        unless ( $c->stash->{body} && $user->from_body->id eq $c->stash->{body}->id ) {
+        unless ( $c->stash->{live_contacts} ) {
             $c->stash->{body} = $user->from_body;
             $c->forward('fetch_contacts');
         }