diff --git a/frappe/public/js/frappe/form/review.js b/frappe/public/js/frappe/form/review.js
index 13cf55848e..809c5b1507 100644
--- a/frappe/public/js/frappe/form/review.js
+++ b/frappe/public/js/frappe/form/review.js
@@ -71,7 +71,7 @@ frappe.ui.form.Review = class Review {
 			'title': __('Add Review'),
 			'fields': [{
 				fieldname: 'to_user',
-				fieldtype: 'Select',
+				fieldtype: 'Autocomplete',
 				label: __('To User'),
 				options: user_options,
 				default: user_options.includes(doc_owner) ? doc_owner : user_options[0],
diff --git a/frappe/social/doctype/energy_point_log/energy_point_log.json b/frappe/social/doctype/energy_point_log/energy_point_log.json
index aa5d5946cf..1c92fda300 100644
--- a/frappe/social/doctype/energy_point_log/energy_point_log.json
+++ b/frappe/social/doctype/energy_point_log/energy_point_log.json
@@ -41,7 +41,7 @@
    "read_only": 1,
    "remember_last_selected_value": 0,
    "report_hide": 0,
-   "reqd": 0,
+   "reqd": 1,
    "search_index": 1,
    "set_only_once": 0,
    "translatable": 0,
@@ -259,7 +259,7 @@
  "istable": 0,
  "max_attachments": 0,
  "menu_index": 0,
- "modified": "2019-03-27 23:49:54.841493",
+ "modified": "2019-03-29 20:01:05.503043",
  "modified_by": "Administrator",
  "module": "Social",
  "name": "Energy Point Log",
diff --git a/frappe/social/doctype/energy_point_rule/energy_point_rule.js b/frappe/social/doctype/energy_point_rule/energy_point_rule.js
index 31b043d384..c67c95f836 100644
--- a/frappe/social/doctype/energy_point_rule/energy_point_rule.js
+++ b/frappe/social/doctype/energy_point_rule/energy_point_rule.js
@@ -15,7 +15,8 @@ frappe.ui.form.on('Energy Point Rule', {
 		frappe.model.with_doctype(reference_doctype, () => {
 			const map_for_options = df => ({ label: df.label, value: df.fieldname });
 			const fields = frappe.meta.get_docfields(frm.doc.reference_doctype);
-			const user_fields = fields.filter(df => df.fieldtype === 'Link' && df.options === 'User')
+			const user_fields = fields.filter(df => (df.fieldtype === 'Link' && df.options === 'User')
+				|| df.fieldtype === 'Data')
 				.map(map_for_options)
 				.concat([{label: __('Owner'), value: 'owner'}]);
 
diff --git a/frappe/social/doctype/energy_point_rule/energy_point_rule.py b/frappe/social/doctype/energy_point_rule/energy_point_rule.py
index 2795ceb249..14dd988b26 100644
--- a/frappe/social/doctype/energy_point_rule/energy_point_rule.py
+++ b/frappe/social/doctype/energy_point_rule/energy_point_rule.py
@@ -14,7 +14,7 @@ class EnergyPointRule(Document):
 			multiplier = 1
 
 			if self.multiplier_field:
-				multiplier = doc.get(self.multiplier_field, 1)
+				multiplier = doc.get(self.multiplier_field) or 1
 
 			points = round(self.points * multiplier)
 			reference_doctype = doc.doctype
@@ -24,12 +24,14 @@ class EnergyPointRule(Document):
 
 			# incase of zero as result after roundoff
 			if not points: return
-
-			create_energy_points_log(reference_doctype, reference_name, {
-				'points': points,
-				'user': user,
-				'rule': rule
-			})
+			try:
+				create_energy_points_log(reference_doctype, reference_name, {
+					'points': points,
+					'user': user,
+					'rule': rule
+				})
+			except Exception as e:
+				frappe.log_error('apply_energy_point', e)
 
 
 def process_energy_points(doc, state):