diff --git a/core/doctype/doctype/doctype.py b/core/doctype/doctype/doctype.py
index b0a1aebfbd..9ce5b630b2 100644
--- a/core/doctype/doctype/doctype.py
+++ b/core/doctype/doctype/doctype.py
@@ -111,7 +111,7 @@ class DocType:
 		webnotes.conn.sql("delete from `tabProperty Setter` where doc_type = %s", self.doc.name)
 		webnotes.conn.sql("delete from `tabSearch Criteria` where doc_type = %s", self.doc.name)
 	
-	def on_rename(self, new, old):
+	def on_rename(self, new, old, merge=False):
 		if self.doc.issingle:
 			webnotes.conn.sql("""\
 				update tabSingles set doctype=%s
diff --git a/core/doctype/profile/profile.py b/core/doctype/profile/profile.py
index 725aa45d1c..fe6e1fca46 100644
--- a/core/doctype/profile/profile.py
+++ b/core/doctype/profile/profile.py
@@ -214,7 +214,7 @@ Thank you,<br>
 		webnotes.conn.sql("""delete from `tabComment` where comment_doctype='Message'
 			and (comment_docname=%s or owner=%s)""", (self.doc.name, self.doc.name))
 	
-	def on_rename(self,newdn,olddn):
+	def on_rename(self,newdn,olddn, merge=False):
 		self.validate_rename(newdn, olddn)
 			
 		tables = webnotes.conn.sql("show tables")
diff --git a/public/js/legacy/widgets/form/fields.js b/public/js/legacy/widgets/form/fields.js
index a7ebd8b09f..4f801d7e77 100644
--- a/public/js/legacy/widgets/form/fields.js
+++ b/public/js/legacy/widgets/form/fields.js
@@ -1088,7 +1088,7 @@ SelectField.prototype.make_input = function() {
 				padding-left: 6px; padding-right: 6px; margin-left: 6px;'>\
 				<i class='icon-plus'></i></button>")
 				.click(function() {
-					cur_frm.attachments.new_attachment();
+					cur_frm.attachments.new_attachment(me.df.fieldname);
 				})
 				.appendTo(this.input_area);
 		}
diff --git a/public/js/wn/form/attachments.js b/public/js/wn/form/attachments.js
index cb9788ac82..7c43151c70 100644
--- a/public/js/wn/form/attachments.js
+++ b/public/js/wn/form/attachments.js
@@ -62,11 +62,14 @@ wn.ui.form.Attachments = Class.extend({
 
 		var file_list = this.get_file_list();
 		var file_names = keys(file_list).sort();
-
+		
 		// add attachment objects
 		for(var i=0; i<file_names.length; i++) {
 			this.add_attachment(file_names[i], file_list);
 		}
+		
+		// refresh select fields with options attach_files:
+		this.refresh_attachment_select_fields();
 	},
 	get_file_list: function() {
  		return this.frm.doc.file_list ? JSON.parse(this.frm.doc.file_list) : {};
@@ -104,16 +107,13 @@ wn.ui.form.Attachments = Class.extend({
 									return;
 								}
 								me.remove_fileid(data);
-								me.frm && me.frm.cscript.on_remove_attachment 
-									&& me.frm.cscript.on_remove_attachment(me.frm.doc);
-								me.frm.refresh();
 							}
 						});
 					});
 				return false;
 			});
 	},
-	new_attachment: function() {
+	new_attachment: function(fieldname) {
 		var me = this;
 		if(!this.dialog) {
 			this.dialog = new wn.ui.Dialog({
@@ -125,7 +125,7 @@ wn.ui.form.Attachments = Class.extend({
 		}
 		this.dialog.body.innerHTML = '';
 		this.dialog.show();
-
+		
 		wn.upload.make({
 			parent: this.dialog.body,
 			args: {
@@ -134,15 +134,19 @@ wn.ui.form.Attachments = Class.extend({
 				docname: this.frm.docname
 			},
 			callback: function(fileid, filename, r) {
-				me.update_attachment(fileid, filename, r);
+				me.update_attachment(fileid, filename, fieldname, r);
 			}
 		});
 	},
-	update_attachment: function(fileid, filename, r) {
+	update_attachment: function(fileid, filename, fieldname, r) {
 		this.dialog && this.dialog.hide();
 		if(fileid) {
 			this.add_to_file_list(fileid, filename);
 			this.refresh();
+			if(fieldname) {
+				this.frm.set_value(fieldname, "files/"+filename);
+				this.frm.cscript[fieldname] && this.frm.cscript[fieldname](this.frm.doc);
+			}
 		}
 	},
 	add_to_file_list: function(fileid, filename) {
@@ -159,5 +163,18 @@ wn.ui.form.Attachments = Class.extend({
 				new_file_list[key] = value;
 		});
 		this.frm.doc.file_list = JSON.stringify(new_file_list);
+		this.refresh();
+	},
+	refresh_attachment_select_fields: function() {
+		for(var i=0; i<this.frm.fields.length; i++) {
+			if(this.frm.fields[i].attach_files) {
+				var fieldname = this.frm.fields[i].df.fieldname;
+				refresh_field(fieldname);
+				if(this.frm.doc[fieldname]!=undefined && !inList(this.frm.fields[i].df.options.split("\n"), this.frm.doc[fieldname])) {
+					this.frm.cscript.on_remove_attachment && this.frm.cscript.on_remove_attachment(this.frm.doc);
+					this.frm.set_value(fieldname, "");
+				}
+			}
+		}
 	}
 });
\ No newline at end of file
diff --git a/webnotes/__init__.py b/webnotes/__init__.py
index 2d765d95dc..3538fdee59 100644
--- a/webnotes/__init__.py
+++ b/webnotes/__init__.py
@@ -342,9 +342,9 @@ def reload_doc(module, dt=None, dn=None):
 	import webnotes.modules
 	return webnotes.modules.reload_doc(module, dt, dn)
 
-def rename_doc(doctype, old, new, debug=0, force=False):
+def rename_doc(doctype, old, new, debug=0, force=False, merge=False):
 	from webnotes.model.rename_doc import rename_doc
-	rename_doc(doctype, old, new, force=force)
+	rename_doc(doctype, old, new, force=force, merge=merge)
 
 def insert(doclist):
 	import webnotes.model
diff --git a/webnotes/model/doc.py b/webnotes/model/doc.py
index 3b2313ddbb..92ae5f31fb 100755
--- a/webnotes/model/doc.py
+++ b/webnotes/model/doc.py
@@ -670,9 +670,10 @@ def copy_common_fields(from_doc, to_doc):
 		if doctype_list.get_field(fieldname) and to_doc.fields[fieldname] != value:
 			to_doc.fields[fieldname] = value
 			
-def validate_name(doctype, name, case=None):
-	if webnotes.conn.sql('select name from `tab%s` where name=%s' % (doctype,'%s'), name):
-		raise NameError, 'Name %s already exists' % name
+def validate_name(doctype, name, case=None, merge=False):
+	if not merge:
+		if webnotes.conn.sql('select name from `tab%s` where name=%s' % (doctype,'%s'), name):
+			raise NameError, 'Name %s already exists' % name
 	
 	# no name
 	if not name: return 'No Name Specified for %s' % doctype
diff --git a/webnotes/model/rename_doc.py b/webnotes/model/rename_doc.py
index 3f5da9d311..b2c4e8c3e8 100644
--- a/webnotes/model/rename_doc.py
+++ b/webnotes/model/rename_doc.py
@@ -1,7 +1,7 @@
 from __future__ import unicode_literals
 import webnotes
 from webnotes import _
-import webnotes.utils
+from webnotes.utils import cint
 import webnotes.model.doctype
 from webnotes.model.doc import validate_name
 
@@ -13,16 +13,19 @@ def rename_doc(doctype, old, new, force=False, merge=False):
 	"""
 	if not webnotes.conn.exists(doctype, old):
 		return
-		
+	
+	force = cint(force)
+	merge = cint(merge)
+	
 	# get doclist of given doctype
 	doclist = webnotes.model.doctype.get(doctype)
 	
-	new = validate_rename(doctype, new, doclist, merge, force)
-
 	# call on_rename
 	obj = webnotes.get_obj(doctype, old)
 	if hasattr(obj, 'on_rename'):
-		new = obj.on_rename(new, old) or new
+		new = obj.on_rename(new, old, merge) or new
+		
+	new = validate_rename(doctype, new, doclist, merge, force)
 		
 	if not merge:
 		rename_parent_and_child(doctype, old, new, doclist)
@@ -61,8 +64,8 @@ def validate_rename(doctype, new, doclist, merge, force):
 
 	if merge and not exists:
 		webnotes.msgprint("%s: %s does not exist, select a new target to merge." % (doctype, new), raise_exception=1)
-		
-	if not merge and exists:
+	
+	if (not merge) and exists:
 		webnotes.msgprint("%s: %s exists, select a new, new name." % (doctype, new), raise_exception=1)
 
 	if not webnotes.has_permission(doctype, "write"):
@@ -72,7 +75,7 @@ def validate_rename(doctype, new, doclist, merge, force):
 		webnotes.msgprint("%s cannot be renamed" % doctype, raise_exception=1)
 	
 	# validate naming like it's done in doc.py
-	new = validate_name(doctype, new)
+	new = validate_name(doctype, new, merge=merge)
 
 	return new
 
diff --git a/webnotes/widgets/form/run_method.py b/webnotes/widgets/form/run_method.py
index b40cb91e64..6d8134567f 100644
--- a/webnotes/widgets/form/run_method.py
+++ b/webnotes/widgets/form/run_method.py
@@ -64,6 +64,9 @@ def runserverobj():
 			else:
 				webnotes.response['message'] = r
 		
+		from webnotes.widgets.form.load import add_file_list
+		add_file_list(so.doc.doctype, so.doc.name, so.doclist)
+		
 		webnotes.response['docs'] += so.doclist
 
 def check_guest_access(doc):