diff --git a/inpgen/atom_input.f b/inpgen/atom_input.f
index 4a8299d505caaaac884f80ade18b19969a9d665f..485d625230a3536df4d54acce219d8f9d8ba9e0b 100644
--- a/inpgen/atom_input.f
+++ b/inpgen/atom_input.f
@@ -17,7 +17,7 @@
 !***********************************************************************
       SUBROUTINE atom_input(
      >                      infh,xl_buffer,bfh,buffer,
-     >                      jspins,film,idlist,xmlCoreRefOccs,
+     >                      input,idlist,xmlCoreRefOccs,
      X                      nline,xmlElectronStates,
      X                      xmlPrintCoreStates,xmlCoreOccs,
      <                      nel,atoms,enpara )
@@ -31,7 +31,8 @@
 
       IMPLICIT NONE
 
-      TYPE(t_enpara),INTENT(INOUT)     :: enpara
+      TYPE(t_input),INTENT(INOUT)    :: input
+      TYPE(t_enpara),INTENT(INOUT)   :: enpara
       TYPE(t_atoms),INTENT(INOUT)    :: atoms
 
 ! ... Arguments ...
@@ -40,8 +41,7 @@
       INTEGER, INTENT (INOUT) :: nline ! current line in this file
       INTEGER, INTENT (INOUT) :: nel   ! number of valence electrons
 
-      INTEGER, INTENT (IN)     :: xl_buffer,jspins
-      LOGICAL, INTENT (IN)     :: film
+      INTEGER, INTENT (IN)     :: xl_buffer
       REAL   , INTENT (IN)     :: idlist(atoms%ntype)
       REAL   , INTENT (IN)     :: xmlCoreRefOccs(29)
       REAL, INTENT (INOUT)     :: xmlCoreOccs(2,29,atoms%ntype)
@@ -346,6 +346,18 @@
       coreocc(1:nstd,1:atoms%ntype) = -1.0
 
       nel = 0
+
+      IF ( ANY(atoms%bmu(:) > 0.0) ) input%jspins=2 
+
+      ALLOCATE (enpara%el0(0:3,atoms%ntype,input%jspins))
+      ALLOCATE (enpara%evac0(2,input%jspins))
+      ALLOCATE (enpara%lchange(0:3,atoms%ntype,input%jspins))
+      ALLOCATE (enpara%lchg_v(2,input%jspins))
+      ALLOCATE (enpara%skiplo(atoms%ntype,input%jspins))
+      ALLOCATE (enpara%ello0(atoms%nlod,atoms%ntype,input%jspins))
+      ALLOCATE (enpara%llochg(atoms%nlod,atoms%ntype,input%jspins))
+      ALLOCATE (enpara%enmix(input%jspins))
+
       enpara%el0 = -9999.9
       enpara%ello0 = -9999.9
       enpara%evac0 = eVac0Default_const
@@ -600,7 +612,7 @@ c           in s and p states equal occupation of up and down states
 
       ENDDO
 
-      DO j = 1, jspins
+      DO j = 1, input%jspins
          CALL default_enpara(j,atoms,enpara)
       END DO
 
@@ -631,9 +643,9 @@ c           in s and p states equal occupation of up and down states
          lmaxdTemp = atoms%lmaxd
          atoms%lmaxd = 3
          OPEN (40,file='enpara',form='formatted',status='unknown') ! write out an enpara-file
-         DO j = 1, jspins
+         DO j = 1, input%jspins
             OPEN (42)
-            CALL w_enpara(atoms,j,film,enpara,42)
+            CALL w_enpara(atoms,j,input%film,enpara,42)
             CLOSE (42,status='delete')
          ENDDO
          CLOSE (40)
diff --git a/inpgen/set_inp.f90 b/inpgen/set_inp.f90
index b261a1c0515e9c8f82697dc331168eccbb282bb6..a112fe8c372e163524c0ff3a3d09821b50b3eda1 100644
--- a/inpgen/set_inp.f90
+++ b/inpgen/set_inp.f90
@@ -190,7 +190,6 @@
         IF (atoms%nz(n).EQ.68) atoms%bmu(n) = 3.1
         IF (atoms%nz(n).EQ.69) atoms%bmu(n) = 2.1
       ENDDO
-      IF ( ANY(atoms%bmu(:) > 0.0) ) input%jspins=2 
 
       input%delgau = input%tkb ; atoms%ntype = atoms%ntype ; atoms%nat = atoms%nat
       DO i = 1, 10
@@ -211,18 +210,9 @@
       stars%gmax = 3.0 * kmax ; xcpot%gmaxxc = 2.5 * kmax ; input%rkmax = kmax
       atoms%lnonsph(:) = min( max( (atoms%lmax(:)-2),3 ), 8 )
 
-      ALLOCATE (enpara%el0(0:3,atoms%ntype,input%jspins))
-      ALLOCATE (enpara%evac0(2,input%jspins))
-      ALLOCATE (enpara%lchange(0:3,atoms%ntype,input%jspins))
-      ALLOCATE (enpara%lchg_v(2,input%jspins))
-      ALLOCATE (enpara%skiplo(atoms%ntype,input%jspins))
-      ALLOCATE (enpara%ello0(atoms%nlod,atoms%ntype,input%jspins))
-      ALLOCATE (enpara%llochg(atoms%nlod,atoms%ntype,input%jspins))
-      ALLOCATE (enpara%enmix(input%jspins))
-
       CALL atom_input(&
      &                infh,xl_buffer,bfh,buffer,&
-     &                input%jspins,input%film,idlist,xmlCoreRefOccs,&
+     &                input,idlist,xmlCoreRefOccs,&
      &                nline,&
      &                xmlElectronStates,xmlPrintCoreStates,xmlCoreOccs,&
      &                nel,atoms,enpara)