-<div class="row"><div class="col-sm-12">
-<form class="cmxform form-horizontal" id="registrationForm" method="post" enctype="multipart/form-data" role="form">
-{% csrf_token %}
- <div class="form-group">
- <label for="authority_hrn" class="control-label">Authority</label>
- <p></p>
- <input id="authority_hrn" name="authority_hrn" class="form-control" style="width:530px" value="{{ authority_hrn }}" placeholder="fed4fire" required>
- <p class="help-block">If your organization does not deploy a Fed4FIRE authority itself,<br> you can use the default one called "fed4fire".</p>
+<form action="/register" class="cmxform form-horizontal" method="post" enctype="multipart/form-data">
+<div class="row">
+ <div class="col-md-12">
+ <p>
+ {% csrf_token %}
+ <label for="authority_hrn" class="control-label">Organization</label>
+ </p>
+ <p>
+ <select id="org_name" name="org_name" class="form-control" style="width:590px" value="{{ organization }}"
+ title="Choose your organization (company/university) from the list that apears when you click in the field and start to type.
+ Use the arrow keys to scroll through the list; type part of the name to narrow down the list. We will send an email to
+ the managers that we have on record for your organization, asking them to validate your sign-up request." required>
+ {% if authorities %}
+ {% for authority in authorities %}
+ {% if authority.name %}
+ <option value="{{ authority.authority_hrn }}">{{authority.name}}</option>
+ {% else %}
+ <option value="{{ authority.authority_hrn }}">{{authority.authority_hrn}}</option>
+ {% endif %}
+ {% endfor %}
+ {% else %}
+ <option value:"">No authority found !!!</option>
+ {% endif %}
+ </select>
+ </p>
+ <p class="help-block">If your organization does not deploy a Fed4FIRE authority itself, you can use the<br> default one called "fed4fire.global".
+ If your organization however does provide a<br> Fed4FIRE authority itself, please make sure to select it here. If you start typing<br> your organization's
+ name, it will pop up.
+ </p>