diff --git a/D3K.ahk b/D3K.ahk
index 7c12e0e..49577d4 100644
--- a/D3K.ahk
+++ b/D3K.ahk
@@ -2,11 +2,7 @@
 
 Menu, Tray, Icon, shell32.dll, 283	; Set the tray icon to a keyboard
 
-SetWorkingDir, %A_MyDocuments%\D3K	; Make sure we can find the .ahks linked below
-
-ini = %A_MyDocuments%\D3Ksettings.ini	; Where the settings ini is
-
-ini_writeValue(ini, "Version", "2.6")
+ini_writeValue(ini, "Version", d3k_version)
 
 ;------------------------------------------------------------------------------
 ; Make sure the settings file exists, if not, create it
@@ -31,7 +27,7 @@ GloVar=0
 [Language]
 German=0
 [Info]
-Version=2.6
+Version=0
 ), %ini%
 Run Settings.ahk	; Runs the GUI for changing the settings, also accessible with Alt+Shift+\ (also easy way to restart this script)
 }
@@ -142,15 +138,16 @@ If (glovar = 1)
 						if !(REValue = dealinfo.xid)
 						{
 							run addemail.ahk
-							Break
+							Continue
 						}
 						
 						; Replace the data in glovar.ahk with the data from the ini
 						FileRead, tempglovar, glovar.ahk
+						tempglovar := RegExReplace(tempglovar, "(?<=\$xid::).*", dealinfo.xid)
 						tempglovar := RegExReplace(tempglovar, "(?<=\$dem::).*", dealinfo.email)
 						tempglovar := RegExReplace(tempglovar, "(?<=\$dnm::).*", dealinfo.name)
 						tempglovar := RegExReplace(tempglovar, "(?<=\$dus::).*", dealinfo.user)
-						tempglovar := RegExReplace(tempglovar, "(?<=\$xid::).*", dealinfo.xid)
+						tempglovar := RegExReplace(tempglovar, "(?<=\$dorg::).*", dealinfo.org)
 						FileAppend, %tempglovar%, tempglovar
 						FileCopy, tempglovar, glovar.ahk,1
 						FileDelete, tempglovar
@@ -569,6 +566,7 @@ SetTitleMatchMode, 2
 	::pmcalc::PMCalc
 	::vat::VAT
 	:*:racf::RACF
+	::igrade::iGrade
 
 
 ; German