diff --git a/alliance_auth/settings.py.example b/alliance_auth/settings.py.example
index 06589f99..9d26f81b 100755
--- a/alliance_auth/settings.py.example
+++ b/alliance_auth/settings.py.example
@@ -157,7 +157,7 @@ STATIC_URL = '/static/'
 # Set to FALSE for alliance
 # Set to TRUE for corp
 ###########################
-IS_CORP = False
+IS_CORP = 'False' == os.environ.get('AA_IS_CORP', 'True')
 
 
 #################
diff --git a/hrapplications/forms.py b/hrapplications/forms.py
index 17d672e2..4e07f7c7 100755
--- a/hrapplications/forms.py
+++ b/hrapplications/forms.py
@@ -2,9 +2,21 @@ from django import forms
 from django.conf import settings
 
 class HRApplicationForm(forms.Form):
+    allchoices = []
+
+    if settings.IS_CORP:
+        corp = EveCorporationInfo.objects.filter(corporation_id=settings.CORP_ID)
+        allchoices.append((str(corp.corporation_id), str(corp.corporation_name)))
+    else:
+        for corp in EveCorporationInfo.objects.all():
+            if corp.alliance is not None:
+                if corp.alliance.alliance_id == settings.ALLIANCE_ID:
+                    allchoices.append((str(corp.corporation_id), str(corp.corporation_name)))
+
     character_name = forms.CharField(max_length=254, required=True, label="Main Character Name")
     full_api_id = forms.CharField(max_length=254, required=True, label="API ID")
     full_api_key = forms.CharField(max_length=254, required=True, label="API Verification Code")
+    corp = forms.ChoiceField(choices=allchoices, required=True, label="Corp")
     is_a_spi = forms.ChoiceField(choices=[('Yes', 'Yes'), ('No', 'No')], required=True, label='Are you a spy?')
     about = forms.CharField(widget=forms.Textarea, required=False, label="About You")
     extra = forms.CharField(widget=forms.Textarea, required=False, label="Extra Application Info")
diff --git a/hrapplications/models.py b/hrapplications/models.py
index 4e6d96d4..585ee53c 100755
--- a/hrapplications/models.py
+++ b/hrapplications/models.py
@@ -12,6 +12,7 @@ class HRApplication(models.Model):
     about = models.TextField(default="")
     extra = models.TextField(default="")
 
+    corp = models.ForeignKey(EveCorporationInfo)
     user = models.ForeignKey(User)
 
     approved_denied = models.NullBooleanField(blank=True, null=True)
diff --git a/hrapplications/views.py b/hrapplications/views.py
index aa64eb97..4954b107 100755
--- a/hrapplications/views.py
+++ b/hrapplications/views.py
@@ -56,6 +56,7 @@ def hr_application_create_view(request):
 			application.character_name = form.cleaned_data['character_name']
 			application.full_api_id = form.cleaned_data['full_api_id']
 			application.full_api_key = form.cleaned_data['full_api_key']
+			application.corp = EveCorporationInfo.objects.get(corporation_id=form.cleaned_data['corp'])
 			application.is_a_spi = form.cleaned_data['is_a_spi']
 			application.about = form.cleaned_data['about']
 			application.extra = form.cleaned_data['extra']