diff --git a/app/models/form_submission.server.model.js b/app/models/form_submission.server.model.js
index a02c9568..1d1ab29a 100644
--- a/app/models/form_submission.server.model.js
+++ b/app/models/form_submission.server.model.js
@@ -253,7 +253,7 @@ FormSubmissionSchema.pre('save', function (next){
 		if(this.isModified('ipAddr') || !this.geoLocation){
 			freegeoip.getLocation(this.ipAddr, function(err, location){
 				if(err) return next(err);
-				//self.geoLocation = JSON.parse(location);
+				self.geoLocation = JSON.parse(location);
 				return next();
 			});
 		}
diff --git a/public/modules/forms/admin/views/directiveViews/form/edit-submissions-form.client.view.html b/public/modules/forms/admin/views/directiveViews/form/edit-submissions-form.client.view.html
index eb774694..e79d19fc 100644
--- a/public/modules/forms/admin/views/directiveViews/form/edit-submissions-form.client.view.html
+++ b/public/modules/forms/admin/views/directiveViews/form/edit-submissions-form.client.view.html
@@ -315,7 +315,7 @@
 						{{row.device.name}}, {{row.device.type}}
 					</td>
 					<td>
-						{{row.geoLocation.city}}, {{row.geoLocation.country}}
+						{{row.geoLocation.city}}, {{row.geoLocation.country_name}}
 					</td>
 					<td>
 						{{row.ipAddr}}