diff --git a/cave/com.raytheon.viz.gfe/src/com/raytheon/viz/gfe/dialogs/formatterlauncher/StoreTransmitDlg.java b/cave/com.raytheon.viz.gfe/src/com/raytheon/viz/gfe/dialogs/formatterlauncher/StoreTransmitDlg.java
index d764d43ecd..98174d46bc 100755
--- a/cave/com.raytheon.viz.gfe/src/com/raytheon/viz/gfe/dialogs/formatterlauncher/StoreTransmitDlg.java
+++ b/cave/com.raytheon.viz.gfe/src/com/raytheon/viz/gfe/dialogs/formatterlauncher/StoreTransmitDlg.java
@@ -65,7 +65,6 @@ import com.raytheon.viz.ui.dialogs.CaveSWTDialog;
  * 28May2010    2187       cjeanbap    Added StdTextProductFactory
  *                                      functionality.
  * 09 NOV 2012  1298       rferrel     Changes for non-blocking dialog.
- * 08Mar2013    15564   mgamazaychikov Set the awipsWanPil based on productText data
  * </pre>
  * 
  * @author lvenable
@@ -388,15 +387,7 @@ public class StoreTransmitDlg extends CaveSWTDialog implements
         } else {
             req = new OUPRequest();
             OfficialUserProduct oup = new OfficialUserProduct();
-            /*
-             * DR15564 - set the awipsWanPil based on productText data
-             */
-            String[] splitLines = productText.split("\n");
-            String[] firstLine = splitLines[0].split(" ");
-            String[] secondLine = splitLines[1].split(" ");
-            String cccc = firstLine[1];
-            String productNnnidXxxid = secondLine[0];
-            String awipsWanPil = cccc + productNnnidXxxid;
+            String awipsWanPil = productIdTF.getText();
             oup.setAwipsWanPil(awipsWanPil);
             oup.setProductText(productText);
 
diff --git a/edexOsgi/com.raytheon.uf.edex.dissemination/src/com/raytheon/uf/edex/dissemination/ModifyProduct.java b/edexOsgi/com.raytheon.uf.edex.dissemination/src/com/raytheon/uf/edex/dissemination/ModifyProduct.java
index fbf0fba128..a6fa5407dc 100644
--- a/edexOsgi/com.raytheon.uf.edex.dissemination/src/com/raytheon/uf/edex/dissemination/ModifyProduct.java
+++ b/edexOsgi/com.raytheon.uf.edex.dissemination/src/com/raytheon/uf/edex/dissemination/ModifyProduct.java
@@ -41,7 +41,6 @@ import com.raytheon.uf.edex.dissemination.transmitted.TransmittedProductList;
  * ------------ ---------- ----------- --------------------------
  * Nov 13, 2009            njensen     Initial creation
  * 08/20/2012   DR 15340   D. Friedman Fix BBB problems
- * 03/08/2013	15564   mgamazaychikov Trimmed extra spaces in afosId
  * 
  * </pre>
  * 
@@ -72,7 +71,7 @@ public class ModifyProduct {
             List<AfosToAwips> list = dao.lookupAfosId(ttaaii, cccc).getIdList();
             String productId = null;
             for (AfosToAwips ata : list) {
-                String afosId = ata.getAfosid().trim();
+                String afosId = ata.getAfosid();
                 String awipsId = afosId.substring(3);
                 if (awipsId.equals(productAwipsId)) {
                     productId = afosId;