diff --git a/GetAccept-v2/Install/GetAccept.bas b/GetAccept-v2/Install/GetAccept.bas
index 781c313..6a2e467 100644
--- a/GetAccept-v2/Install/GetAccept.bas
+++ b/GetAccept-v2/Install/GetAccept.bas
@@ -14,6 +14,7 @@ Private Const GlobalDocumentCommentField As String = "comment"
 Private Const GlobalDocumentCompanyField As String = "company"
 Private Const GlobalDocumentTypeFieldOptionQuote As String = "tender"
 Private Const GlobalDocumentTypeFieldOptionAgreement As String = "agreement"
+Private Const GlobalDocumentUseTypeFromOriginalDocument As Boolean = False
 
 ' Person
 Private Const GlobalPersonFirstNameField As String = "firstname"
@@ -673,7 +674,7 @@ ErrorHandler:
 End Function
 
 
-Public Sub DownloadFile(sLink As String, sFileName As String, className As String, commentField As String)
+Public Sub DownloadFile(sLink As String, sFileName As String, className As String, commentField As String, lngOriginalDocumentRecordID As Long)
     On Error GoTo ErrorHandler
     
     ThisApplication.MousePointer = 11
@@ -714,15 +715,29 @@ Public Sub DownloadFile(sLink As String, sFileName As String, className As Strin
         Call pDocument.Load(sFileLocation)
         Call oRecord.Open(Database.Classes("document"))
         oRecord.Value(GlobalDocumentField) = pDocument
+        
+        ' Set the document type
         If oRecord.Fields.Exists(GlobalDocumentTypeField) Then
-            oRecord(GlobalDocumentTypeField) = Database.Classes("document").Fields(GlobalDocumentTypeField).Options.Lookup(GlobalDocumentTypeFieldOptionAgreement, lkLookupOptionByKey)
+            Dim lngTypeOption As Long
+            If GlobalDocumentUseTypeFromOriginalDocument Then
+                Dim oRecordOriginalDocument As New LDE.Record
+                Dim oViewOriginalDocument As New LDE.View
+                Call oViewOriginalDocument.Add(GlobalDocumentTypeField)
+                Call oRecordOriginalDocument.Open(Database.Classes("document"), lngOriginalDocumentRecordID, oViewOriginalDocument)
+                lngTypeOption = oRecordOriginalDocument.Value(GlobalDocumentTypeField)
+            Else
+                lngTypeOption = Database.Classes("document").Fields(GlobalDocumentTypeField).Options.Lookup(GlobalDocumentTypeFieldOptionAgreement, lkLookupOptionByKey)
+            End If
+            oRecord(GlobalDocumentTypeField) = lngTypeOption
         End If
+        
+        ' Link to open inspector if relation exists with the same name
         If oRecord.Fields.Exists(className) Then
             oRecord(className) = oInspector.Record.ID
         End If
         
-        'connect company if a company field exists on the parent card and the document card.
-        If className <> "company" Then 'only done if the parent isnt alreaady the company
+        ' Connect company if a company field exists on the parent card and the document card.
+        If className <> "company" Then 'only done if the parent isn't already the company
             If oRecord.Fields.Exists(GlobalDocumentCompanyField) Then
                 If oInspector.Record.Fields.Exists(GlobalDocumentCompanyField) Then
                     oRecord(GlobalDocumentCompanyField) = oInspector.Controls.GetValue(GlobalDocumentCompanyField)
@@ -733,18 +748,17 @@ Public Sub DownloadFile(sLink As String, sFileName As String, className As Strin
         oRecord(commentField) = sFileName & " (" & (Localize.GetText("GetAccept", "SIGNED")) & ")"
         oRecord("sent_with_ga") = 1
         oRecord.Update
-         
     Else
         Call Lime.MessageBox(Localize.GetText("GetAccept", "i_download_failed"))
     End If
     
-    VBA.Kill (sFileLocation)
+    Call VBA.Kill(sFileLocation)
+    ThisApplication.MousePointer = 0
     
-    ThisApplication.MousePointer = 1
     Exit Sub
 ErrorHandler:
+    ThisApplication.MousePointer = 0
     Call UI.ShowError("GetAccept.DownloadFile")
-    ThisApplication.MousePointer = 1
 End Sub
 
 Private Function AddOrCheckLocalize(sOwner As String, sCode As String, sDescription As String, sEN_US As String, sSV As String, sNO As String, sFI As String, sDA As String) As Boolean
diff --git a/GetAccept-v2/app.js b/GetAccept-v2/app.js
index 607b72a..af36170 100755
--- a/GetAccept-v2/app.js
+++ b/GetAccept-v2/app.js
@@ -426,7 +426,8 @@ lbs.apploader.register('GetAccept-v2', function () {
                         name: doc.name,
                         status: doc.status,
                         sso_url: sso_url,
-                        is_signing: doc.is_signing
+                        is_signing: doc.is_signing,
+                        lime_id: doc.external_id
                     }
                     document.analytics = function () {
                         documentAnalytics(this);
@@ -449,7 +450,7 @@ lbs.apploader.register('GetAccept-v2', function () {
             apiRequest('documents/' + document_id + '/download', 'GET', '', function (data) {
                 if (typeof (data.document_url) != 'undefined') {
                     alert(viewModel.localize.GetAccept.DOCUMENT_IS_DOWNLOADED);
-                    lbs.common.executeVba("GetAccept.DownloadFile," + data.document_url + ',' + documentname + ',' + className + ',' + appConfig.title_field);
+                    lbs.common.executeVba("GetAccept.DownloadFile," + data.document_url + ',' + documentname + ',' + className + ',' + appConfig.title_field + ',' + document.lime_id);
                 } else {
                     alert('Could not find signed document');
                 }