diff --git a/src/storage/gcs.js b/src/storage/gcs.js
index d48036205..1e1fd95c4 100644
--- a/src/storage/gcs.js
+++ b/src/storage/gcs.js
@@ -224,7 +224,7 @@ function copy(apiConfig, oldFilePath, newFilePath) {
             iteratorCallback(null);
         });
 
-        events.emit('progress', `Copying (multipart) ${relativePath}`);
+        events.emit('progress', `Copying ${relativePath}...`);
     }
 
     const batchSize = -1;
diff --git a/webadmin/src/views/settings.js b/webadmin/src/views/settings.js
index 85f65a84c..82105b750 100644
--- a/webadmin/src/views/settings.js
+++ b/webadmin/src/views/settings.js
@@ -373,7 +373,7 @@ angular.module('Application').controller('SettingsController', ['$scope', '$loca
             $scope.configureBackup.accessKeyId = $scope.backupConfig.accessKeyId;
             $scope.configureBackup.secretAccessKey = $scope.backupConfig.secretAccessKey;
             if ($scope.backupConfig.provider === 'gcs') {
-                $scope.configureBackup.gcsKey.keyFileName = $scope.backupConfig.credentials.client_email;
+                $scope.configureBackup.gcsKey.keyFileName = $scope.backupConfig.credentials && $scope.backupConfig.credentials.client_email;
                 $scope.configureBackup.gcsKey.content = JSON.stringify({
                     "project_id": $scope.backupConfig.projectId,
                     "credentials": $scope.backupConfig.credentials