Index: branches/1.0.x/inc/cart.css
===================================================================
diff -u -N -r14805 -r14824
--- branches/1.0.x/inc/cart.css	(.../cart.css)	(revision 14805)
+++ branches/1.0.x/inc/cart.css	(.../cart.css)	(revision 14824)
@@ -195,8 +195,8 @@
 
 .checkout-form .safe-shop {
 	background: url(@templates_base@/img/safe-shop.jpg) no-repeat 0 40px;
-	min-height: 160px;
-	margin: 115px 0 115px 50px;
+	min-height: 335px;
+	margin: 115px 0 0 50px;
 }
 .checkout-form .safe-shop .title {
 	color: #389901;
Index: branches/1.0.x/checkout.tpl
===================================================================
diff -u -N -r14822 -r14824
--- branches/1.0.x/checkout.tpl	(.../checkout.tpl)	(revision 14822)
+++ branches/1.0.x/checkout.tpl	(.../checkout.tpl)	(revision 14824)
@@ -122,6 +122,8 @@
 						<inp2:m_RenderElement name="inp_edit_password" prefix="ord" field="UserPassword" title="lu_fld_Password" verify_title="lu_fld_VerifyPassword"/>
 					</fieldset>
 				</inp2:m_ifnot>
+				
+				<div class="firstline" style="<inp2:m_ifnot check='m_LoggedIn'>display: none</inp2:m_ifnot>"></div>
 
 				<fieldset>
 					<div class="fieldset">
@@ -333,7 +335,9 @@
 					$('.login-alt').remove();
 
 					// 2. remove user password controls
-					$('#create-account-password, .badge-optional').remove();
+					$('.badge-optional').remove();
+					$('#create-account-password').fadeOut('slow').remove();
+					$('.firstline').fadeIn('slow');
 					FormManager.unregisterField('ord', 'UserPassword');
 					FormManager.unregisterField('ord', 'VerifyUserPassword');