diff --git a/source/java/org/alfresco/web/bean/coci/UploadNewVersionDialog.java b/source/java/org/alfresco/web/bean/coci/UploadNewVersionDialog.java
index 0ca6e0e4e1..a942e08bb5 100644
--- a/source/java/org/alfresco/web/bean/coci/UploadNewVersionDialog.java
+++ b/source/java/org/alfresco/web/bean/coci/UploadNewVersionDialog.java
@@ -1,25 +1,40 @@
-package org.alfresco.web.bean.coci;
+/*
+ * Copyright (C) 2005-2007 Alfresco Software Limited.
+ *
+ * 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 2
+ * of the License, or (at your option) any later version.
 
-import java.io.Serializable;
-import java.util.Map;
-import java.util.StringTokenizer;
+ * 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, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
+
+ * As a special exception to the terms and conditions of version 2.0 of
+ * the GPL, you may redistribute this Program in connection with Free/Libre
+ * and Open Source Software ("FLOSS") applications as described in Alfresco's
+ * FLOSS exception.  You should have recieved a copy of the text describing
+ * the FLOSS exception, and it is also available here:
+ * http://www.alfresco.com/legal/licensing"
+ */
+package org.alfresco.web.bean.coci;
 
 import javax.faces.context.FacesContext;
 
-import org.alfresco.model.ContentModel;
-import org.alfresco.service.cmr.repository.NodeRef;
-import org.alfresco.service.cmr.version.Version;
-import org.alfresco.service.namespace.QName;
 import org.alfresco.web.app.Application;
 
-public class UploadNewVersionDialog extends CheckinCheckoutDialog
+public class UploadNewVersionDialog extends CCDoneEditingDialog
 {
 
-    private final static String MSG_DONE = "done";
     private final static String MSG_UPLOAD_NEW_VERSION = "upload_new_version";
     private final static String MSG_OF = "of";
 
-    private boolean finishedEditing;
+    private boolean finishedEditing = false;
 
     public void setFinishedEditing(boolean finished)
     {
@@ -31,55 +46,12 @@ public class UploadNewVersionDialog extends CheckinCheckoutDialog
         return finishedEditing;
     }
 
-    /**
-     * @return Returns label for new version with major changes
-     */
-    public String getMajorNewVersionLabel()
-    {
-        String label = getCurrentVersionLabel();
-        StringTokenizer st = new StringTokenizer(label, ".");
-        return (Integer.valueOf(st.nextToken()) + 1) + ".0";
-    }
-
-    /**
-     * @return Returns label for new version with minor changes
-     */
-    public String getMinorNewVersionLabel()
-    {
-        String label = getCurrentVersionLabel();
-        StringTokenizer st = new StringTokenizer(label, ".");
-        return st.nextToken() + "." + (Integer.valueOf(st.nextToken()) + 1);
-    }
-
-    /**
-     * @return version label for source node for working copy.
-     */
-    private String getCurrentVersionLabel()
-    {
-        NodeRef workingCopyNodeRef = property.getDocument().getNodeRef();
-        if (this.nodeService.hasAspect(workingCopyNodeRef, ContentModel.ASPECT_COPIEDFROM) == true)
-        {
-            Map<QName, Serializable> workingCopyProperties = nodeService.getProperties(workingCopyNodeRef);
-            NodeRef nodeRef = (NodeRef) workingCopyProperties.get(ContentModel.PROP_COPY_REFERENCE);
-
-            Version curVersion = property.getVersionQueryService().getCurrentVersion(nodeRef);
-            return curVersion.getVersionLabel();
-        }
-
-        return null;
-    }
-
     @Override
     public boolean getFinishButtonDisabled()
     {
         return property.getFile() == null;
     }
 
-    @Override
-    public String getFinishButtonLabel()
-    {
-        return Application.getMessage(FacesContext.getCurrentInstance(), MSG_DONE);
-    }
 
     @Override
     public String getContainerTitle()
@@ -94,5 +66,12 @@ public class UploadNewVersionDialog extends CheckinCheckoutDialog
         property.setKeepCheckedOut(!finishedEditing);
         return checkinFileOK(context, outcome);
     }
+    
+    @Override
+    public void resetState()
+    {
+        super.resetState();
+        finishedEditing = false;
+    }
 
 }
diff --git a/source/web/jsp/content/upload-new-version.jsp b/source/web/jsp/content/upload-new-version.jsp
index d6634ac84f..23bb742018 100644
--- a/source/web/jsp/content/upload-new-version.jsp
+++ b/source/web/jsp/content/upload-new-version.jsp
@@ -77,10 +77,6 @@ if (fileUploaded)
                <h:column id="upload_empty" rendered="#{empty DialogManager.bean.fileName}">
                   <r:upload id="uploader" value="#{DialogManager.bean.fileName}" framework="dialog"/>
                </h:column>
-               <h:column id="upload_not_empty" rendered="#{!empty DialogManager.bean.fileName}">
-                  <h:outputText id="upload_name" value="#{DialogManager.bean.fileName}" style="padding-right:8px"/>
-                  <a:actionLink id="upload_remove" image="/images/icons/delete.gif" value="#{msg.remove}" action="#{DialogManager.bean.removeUploadedFile}" showLink="false"/>
-               </h:column>
             </h:panelGrid>
             <f:verbatim>
          </td>
@@ -91,7 +87,11 @@ if (fileUploaded)
    <tr>
       <td>
       </f:verbatim>
-         <a:booleanEvaluator value="#{DialogManager.bean.versionable && !empty DialogManager.bean.fileName}" > 
+         <%
+      if (fileUploaded)
+      {
+   %>
+         <a:booleanEvaluator value="#{DialogManager.bean.versionable}" > 
 	        <f:verbatim>
             <table cellpadding="2" cellspacing="2" border="0" width="100%">
                <tr>
@@ -106,11 +106,12 @@ if (fileUploaded)
                </tr>
                <tr>
                   <td> </f:verbatim>
-                     <h:selectOneRadio id="vvvv"  value="#{CCProperties.minorChange}" required="true" layout="pageDirection" rendered="#{DialogManager.bean.versionable && !empty DialogManager.bean.fileName}">
+                     <h:selectOneRadio id="vvvv"  value="#{CCProperties.minorChange}" required="true" layout="pageDirection" rendered="#{DialogManager.bean.versionable}">
                         <f:selectItem itemValue="#{true}" itemLabel="#{msg.minor_changes} (#{DialogManager.bean.minorNewVersionLabel})" />
                         <f:selectItem itemValue="#{false}" itemLabel="#{msg.major_changes} (#{DialogManager.bean.majorNewVersionLabel})" />
                      </h:selectOneRadio> 
                      <h:message for="vvvv"></h:message>
+
                      <f:verbatim>
                      </span> <br/>
                   </td>
@@ -130,13 +131,14 @@ if (fileUploaded)
                </tr>
             </table> </f:verbatim>
          </a:booleanEvaluator>
+      
       		 
       		<f:verbatim>
       </td>
       
-   </tr>
+   </tr> 
    </f:verbatim>
-      <a:booleanEvaluator value="#{!empty DialogManager.bean.fileName}">
+      
          <f:verbatim>
          <tr>
       	   <td class="wizardSectionHeading"></f:verbatim><h:outputText value="#{msg.other_options}" /><f:verbatim></td>
@@ -149,7 +151,10 @@ if (fileUploaded)
    	  	   </td>
    	     </tr>
    	     </f:verbatim>
-   	  </a:booleanEvaluator>
+   	  
+   	      <% 
+      }
+          %>
    	  <f:verbatim>
 </table>
 </f:verbatim>