diff --git a/patches/may_2013/p03_update_support_ticket.py b/patches/may_2013/p03_update_support_ticket.py
new file mode 100644
index 0000000..bbdb6e2
--- /dev/null
+++ b/patches/may_2013/p03_update_support_ticket.py
@@ -0,0 +1,25 @@
+# ERPNext - web based ERP (http://erpnext.com)
+# Copyright (C) 2012 Web Notes Technologies Pvt Ltd
+# 
+# This program is free software: you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
+# the Free Software Foundation, either version 3 of the License, or
+# (at your option) any later version.
+# 
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
+# 
+# You should have received a copy of the GNU General Public License
+# along with this program.  If not, see <http://www.gnu.org/licenses/>.
+
+from __future__ import unicode_literals
+import webnotes
+def execute():
+	for d in webnotes.conn.sql("""select name, raised_by from `tabSupport Ticket` 
+			where docstatus < 2""", as_dict=True):
+		tic = webnotes.get_obj("Support Ticket", d.name)
+		tic.set_lead_contact(d.raised_by)
+		webnotes.conn.sql("""update `tabSupport Ticket` set lead = %s, contact = %s, company = %s 
+			where name = %s""", (tic.doc.lead, tic.doc.contact, tic.doc.company, d.name))
\ No newline at end of file
diff --git a/patches/patch_list.py b/patches/patch_list.py
index bd7acb2..f28751c 100644
--- a/patches/patch_list.py
+++ b/patches/patch_list.py
@@ -249,4 +249,5 @@
 	"patches.may_2013.repost_stock_for_no_posting_time",
 	"patches.may_2013.p01_conversion_factor_and_aii",
 	"patches.may_2013.p02_update_valuation_rate",
+	"patches.may_2013.p03_update_support_ticket",
 ]
\ No newline at end of file
diff --git a/support/doctype/support_ticket/support_ticket.py b/support/doctype/support_ticket/support_ticket.py
index 5f01516..63548d3 100644
--- a/support/doctype/support_ticket/support_ticket.py
+++ b/support/doctype/support_ticket/support_ticket.py
@@ -62,13 +62,9 @@
 			if not self.doc.contact:
 				self.doc.contact = webnotes.conn.get_value("Contact", {"email_id": email_id})
 				
-			if not self.doc.company:
-				if self.doc.lead:
-					company = webnotes.conn.get_value("Lead", self.doc.lead, "company")
-				elif self.doc.contact:
-					company = webnotes.conn.get_value("Contact", self.doc.contact, "company")
-				
-				self.doc.company = company or webnotes.conn.get_default("company")
+			if not self.doc.company:		
+				self.doc.company = webnotes.conn.get_value("Lead", self.doc.lead, "company") or \
+					webnotes.conn.get_default("company")
 			
 	def on_trash(self):
 		webnotes.conn.sql("""update `tabCommunication` set support_ticket=NULL