diff --git a/apimanager/accounts/forms.py b/apimanager/accounts/forms.py
index 1cf7abe..3f7a1dc 100644
--- a/apimanager/accounts/forms.py
+++ b/apimanager/accounts/forms.py
@@ -3,7 +3,7 @@ Forms of Accounts app
 """
 
 from django import forms
-from django.utils.translation import ugettext_lazy as _
+from django.utils.translation import gettext_lazy as _
 
 import random
 
diff --git a/apimanager/accounts/views.py b/apimanager/accounts/views.py
index b79ebcc..44055dc 100644
--- a/apimanager/accounts/views.py
+++ b/apimanager/accounts/views.py
@@ -13,7 +13,7 @@ from django.urls import reverse_lazy
 from django.views.generic import FormView
 from obp.api import API, APIError
 from .forms import CreateAccountForm
-from django.utils.translation import ugettext_lazy as _
+from django.utils.translation import gettext_lazy as _
 
 class IndexAccountsView(LoginRequiredMixin, FormView):
 
diff --git a/apimanager/apimanager/urls.py b/apimanager/apimanager/urls.py
index 32143b3..f3f1fe0 100644
--- a/apimanager/apimanager/urls.py
+++ b/apimanager/apimanager/urls.py
@@ -29,7 +29,7 @@ urlpatterns = [
 ]
 urlpatterns += i18n_patterns(
 #urlpatterns = (
-    url(r'^$', HomeView.as_view(), name="home"),
+    re_path(r'^$', HomeView.as_view(), name="home"),
     re_path(r'^single-sign-on',
         OAuthInitiateView.as_view(), name='single-sign-on'),
     re_path(r'^logout$', LogoutView.as_view(), name='oauth-logout'),
diff --git a/apimanager/atms/forms.py b/apimanager/atms/forms.py
index 4750332..16b8620 100644
--- a/apimanager/atms/forms.py
+++ b/apimanager/atms/forms.py
@@ -3,7 +3,7 @@ Forms of ATMs app
 """
 
 from django import forms
-from django.utils.translation import ugettext_lazy as _
+from django.utils.translation import gettext_lazy as _
 
 import random
 
diff --git a/apimanager/atms/views.py b/apimanager/atms/views.py
index 8e2f0e5..18c4f8e 100644
--- a/apimanager/atms/views.py
+++ b/apimanager/atms/views.py
@@ -13,7 +13,7 @@ from django.urls import reverse_lazy
 from django.views.generic import FormView
 from obp.api import API, APIError
 from .forms import CreateAtmForm
-from django.utils.translation import ugettext_lazy as _
+from django.utils.translation import gettext_lazy as _
 from django.views.decorators.csrf import csrf_exempt
 from django.urls import reverse, reverse_lazy
 from base.utils import exception_handle, error_once_only
diff --git a/apimanager/banks/forms.py b/apimanager/banks/forms.py
index 327c853..42d2ad0 100644
--- a/apimanager/banks/forms.py
+++ b/apimanager/banks/forms.py
@@ -3,7 +3,7 @@ Forms of Banks app
 """
 
 from django import forms
-from django.utils.translation import ugettext_lazy as _
+from django.utils.translation import gettext_lazy as _
 
 import random
 
diff --git a/apimanager/banks/views.py b/apimanager/banks/views.py
index e8f9838..04095c7 100644
--- a/apimanager/banks/views.py
+++ b/apimanager/banks/views.py
@@ -13,7 +13,7 @@ from django.urls import reverse, reverse_lazy
 from django.views.generic import FormView
 from obp.api import API, APIError
 from .forms import CreateBankForm
-from django.utils.translation import ugettext_lazy as _
+from django.utils.translation import gettext_lazy as _
 from apimanager.settings import DEBUG
 from django.views.decorators.csrf import csrf_exempt
 from base.utils import exception_handle, error_once_only
diff --git a/apimanager/base/templates/base.html b/apimanager/base/templates/base.html
index c5d7602..bc771bc 100644
--- a/apimanager/base/templates/base.html
+++ b/apimanager/base/templates/base.html
@@ -43,9 +43,9 @@
                             <ul class="dropdown-menu">
                                 <li {% if users_index_url in request.path %} class="active" {% endif %}><a href="{{ users_index_url }}">{% trans "All" %}</a></li>
                                 <hr class="dropdown-hr">
-                                <li {% ifequal request.path url_users_detail %} class="active" {% endifequal %}><a href="{{ url_users_detail }}">{% trans "My User" %}</a></li>
+                                <li {% if request.path == url_users_detail %} class="active" {% endif %}><a href="{{ url_users_detail }}">{% trans "My User" %}</a></li>
                                 <hr class="dropdown-hr">
-                                <li {% ifequal request.path my_user_invitation %} class="active" {% endifequal %}><a href="{{ my_user_invitation }}">{% trans "Invite User" %}</a></li>
+                                <li {% if request.path == my_user_invitation %} class="active" {% endif %}><a href="{{ my_user_invitation }}">{% trans "Invite User" %}</a></li>
                             </ul>
                         </li>
                         {% url "api-metrics" as api_metrics_url %} {% url "connector-metrics" as connector_metrics_url %} {% url "weekly-summary" as metrics_summary_url %}
@@ -123,7 +123,7 @@
     {% if messages %}
     <div class="container messages">
         {% for message in messages %}
-        <div class="alert alert-dismissible{% ifequal message.tags "error" %} alert-danger{% else %}{% ifequal message.tags "debug" %} alert-info{% else %} alert-{{ message.tags }}{% endifequal %}{% endifequal %}" role="alert">
+        <div class="alert alert-dismissible{% if message.tags == "error" %} alert-danger{% else %}{% if message.tags == "debug" %} alert-info{% else %} alert-{{ message.tags }}{% endif %}{% endif %}" role="alert">
             <button type="button" class="close" data-dismiss="alert" aria-label="Close"><span
 					aria-hidden="true">&times;</span></button>
         {{ message }}
diff --git a/apimanager/branches/forms.py b/apimanager/branches/forms.py
index bc004a3..f6a8be8 100644
--- a/apimanager/branches/forms.py
+++ b/apimanager/branches/forms.py
@@ -3,7 +3,7 @@ Forms of branches app
 """
 
 from django import forms
-from django.utils.translation import ugettext_lazy as _
+from django.utils.translation import gettext_lazy as _
 import random
 
 
diff --git a/apimanager/customers/forms.py b/apimanager/customers/forms.py
index dea6e39..f29d0a8 100644
--- a/apimanager/customers/forms.py
+++ b/apimanager/customers/forms.py
@@ -5,7 +5,7 @@ Forms of customers app
 
 from django import forms
 from django.conf import settings
-from django.utils.translation import ugettext_lazy as _
+from django.utils.translation import gettext_lazy as _
 
 from apimanager.settings import API_DATE_FORMAT_WITH_DAY, API_FIELD_TIME_FORMAT
 from bootstrap_datepicker_plus import DatePickerInput, DateTimePickerInput
diff --git a/apimanager/metrics/forms.py b/apimanager/metrics/forms.py
index ff2d5c2..a789461 100644
--- a/apimanager/metrics/forms.py
+++ b/apimanager/metrics/forms.py
@@ -8,7 +8,7 @@ from django.conf import settings
 from datetime import date
 from django.forms.widgets import SelectMultiple, CheckboxInput, CheckboxSelectMultiple
 from datetime import datetime, timedelta
-from django.utils.translation import ugettext_lazy as _
+from django.utils.translation import gettext_lazy as _
 
 from bootstrap_datepicker_plus import DateTimePickerInput
 from apimanager.settings import API_DATE_FORMAT_WITH_DAY_DATE_TIME
diff --git a/apimanager/obp/api.py b/apimanager/obp/api.py
index 3c75a3f..e259f8f 100644
--- a/apimanager/obp/api.py
+++ b/apimanager/obp/api.py
@@ -15,7 +15,7 @@ import requests
 from requests.exceptions import ConnectionError
 
 from django.conf import settings
-from django.utils.translation import ugettext_lazy as _
+from django.utils.translation import gettext_lazy as _
 
 DATE_FORMAT = '%d/%b/%Y %H:%M:%S'
 LOGGER = logging.getLogger(__name__)
diff --git a/apimanager/products/forms.py b/apimanager/products/forms.py
index e01da52..4517ce9 100644
--- a/apimanager/products/forms.py
+++ b/apimanager/products/forms.py
@@ -3,7 +3,7 @@ Forms of branches app
 """
 
 from django import forms
-from django.utils.translation import ugettext_lazy as _
+from django.utils.translation import gettext_lazy as _
 import random
 
 
diff --git a/apimanager/users/forms.py b/apimanager/users/forms.py
index 4804fed..32e9948 100644
--- a/apimanager/users/forms.py
+++ b/apimanager/users/forms.py
@@ -4,7 +4,7 @@ Forms of users app
 """
 
 from django import forms
-from django.utils.translation import ugettext_lazy as _
+from django.utils.translation import gettext_lazy as _
 
 class AddEntitlementForm(forms.Form):
     user_id = forms.CharField(