diff --git a/resources/views/accounts/edit.twig b/resources/views/accounts/edit.twig
index 2384ee57fb..37ebc3b9c0 100644
--- a/resources/views/accounts/edit.twig
+++ b/resources/views/accounts/edit.twig
@@ -53,7 +53,7 @@
             </div>
 
             <!-- panel for credit card options -->
-            {% if Session.get('preFilled').accountRole == 'ccAsset' %}
+            {% if preFilled.accountRole == 'ccAsset' %}
                 <div class="box">
                     <div class="box-header with-border">
                         <h3 class="box-title">{{ 'credit_card_options'|_ }}</h3>
diff --git a/resources/views/partials/flashes.twig b/resources/views/partials/flashes.twig
index 6e428ccdb0..77c03557fe 100644
--- a/resources/views/partials/flashes.twig
+++ b/resources/views/partials/flashes.twig
@@ -9,7 +9,7 @@
 {% endif %}
 
 {# SUCCESS MESSAGE (ALWAYS SINGULAR) #}
-{% if Session.has('success') %}
+{% if session_has('success') %}
     <div class="alert alert-success alert-dismissible" role="alert">
         <button type="button" class="close" data-dismiss="alert">
             <span>&times;</span><span class="sr-only">{{ 'close'|_ }}</span>
@@ -19,7 +19,7 @@
 {% endif %}
 
 {# INFO MESSAGE (CAN BE MULTIPLE) #}
-{% if Session.has('info') %}
+{% if session_has('info') %}
     <div class="alert alert-info alert-dismissible" role="alert">
         <button type="button" class="close" data-dismiss="alert">
             <span>&times;</span><span class="sr-only">{{ 'close'|_ }}</span>
@@ -49,7 +49,7 @@
 {% endif %}
 
 {# WARNING MESSAGE (ALWAYS SINGULAR) #}
-{% if Session.has('warning') %}
+{% if session_has('warning') %}
     <div class="alert alert-warning alert-dismissible" role="alert">
         <button type="button" class="close" data-dismiss="alert">
             <span>&times;</span><span class="sr-only">{{ 'close'|_ }}</span>
@@ -59,7 +59,7 @@
 {% endif %}
 
 {# ERROR MESSAGE (CAN BE MULTIPLE) #}
-{% if Session.has('error') %}
+{% if session_has('error') %}
     <div class="alert alert-danger alert-dismissible" role="alert">
         <button type="button" class="close" data-dismiss="alert">
             <span>&times;</span><span class="sr-only">{{ 'close'|_ }}</span>